diff --git a/cpp/downgrades/0f0a390468a5eb43d1dc72937c028070b106bf53/old.dbscheme b/cpp/downgrades/0f0a390468a5eb43d1dc72937c028070b106bf53/old.dbscheme
new file mode 100644
index 000000000000..0f0a390468a5
--- /dev/null
+++ b/cpp/downgrades/0f0a390468a5eb43d1dc72937c028070b106bf53/old.dbscheme
@@ -0,0 +1,2446 @@
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+    int id : @externalDataElement,
+    string path : string ref,
+    int column: int ref,
+    string value : string ref
+);
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/**
+ * Information about packages that provide code used during compilation.
+ * The `id` is just a unique identifier.
+ * The `namespace` is typically the name of the package manager that
+ * provided the package (e.g. "dpkg" or "yum").
+ * The `package_name` is the name of the package, and `version` is its
+ * version (as a string).
+ */
+external_packages(
+    unique int id: @external_package,
+    string namespace : string ref,
+    string package_name : string ref,
+    string version : string ref
+);
+
+/**
+ * Holds if File `fileid` was provided by package `package`.
+ */
+header_to_external_package(
+    int fileid : @file ref,
+    int package : @external_package ref
+);
+
+/*
+ * Version history
+ */
+
+svnentries(
+    unique int id : @svnentry,
+    string revision : string ref,
+    string author : string ref,
+    date revisionDate : date ref,
+    int changeSize : int ref
+)
+
+svnaffectedfiles(
+    int id : @svnentry ref,
+    int file : @file ref,
+    string action : string ref
+)
+
+svnentrymsg(
+    unique int id : @svnentry ref,
+    string message : string ref
+)
+
+svnchurn(
+    int commit : @svnentry ref,
+    int file : @file ref,
+    int addedLines : int ref,
+    int deletedLines : int ref
+)
+
+/*
+ * C++ dbscheme
+ */
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+@location = @location_stmt | @location_expr | @location_default ;
+
+/**
+ * The location of an element that is not an expression or a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+    /** The location of an element that is not an expression or a statement. */
+    unique int id: @location_default,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_stmt(
+    /** The location of a statement. */
+    unique int id: @location_stmt,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of an expression.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_expr(
+    /** The location of an expression. */
+    unique int id: @location_expr,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+numlines(
+    int element_id: @sourceline ref,
+    int num_lines: int ref,
+    int num_code: int ref,
+    int num_comment: int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location_default ref
+);
+
+files(
+    unique int id: @file,
+    string name: string ref
+);
+
+folders(
+    unique int id: @folder,
+    string name: string ref
+);
+
+@container = @folder | @file
+
+containerparent(
+    int parent: @container ref,
+    unique int child: @container ref
+);
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+/*
+case @function.kind of
+  1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+| 6 = @builtin_function     // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+*/
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * would change the semantics of this decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+case @usertype.kind of
+|  0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+*/
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      /* TODO | @fixedpointtype */
+      | @routinetype
+      | @ptrtomember
+      | @decltype;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_expr ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_expr ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_stmt ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+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;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/* XML Files */
+
+xmlEncoding(unique int id: @file ref, string encoding: string ref);
+
+xmlDTDs(
+    unique int id: @xmldtd,
+    string root: string ref,
+    string publicId: string ref,
+    string systemId: string ref,
+    int fileid: @file ref
+);
+
+xmlElements(
+    unique int id: @xmlelement,
+    string name: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlAttrs(
+    unique int id: @xmlattribute,
+    int elementid: @xmlelement ref,
+    string name: string ref,
+    string value: string ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlNs(
+    int id: @xmlnamespace,
+    string prefixName: string ref,
+    string URI: string ref,
+    int fileid: @file ref
+);
+
+xmlHasNs(
+    int elementId: @xmlnamespaceable ref,
+    int nsId: @xmlnamespace ref,
+    int fileid: @file ref
+);
+
+xmlComments(
+    unique int id: @xmlcomment,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int fileid: @file ref
+);
+
+xmlChars(
+    unique int id: @xmlcharacters,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int isCDATA: int ref,
+    int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+    int xmlElement: @xmllocatable ref,
+    int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters
+              | @xmlelement
+              | @xmlcomment
+              | @xmlattribute
+              | @xmldtd
+              | @file
+              | @xmlnamespace;
diff --git a/cpp/downgrades/0f0a390468a5eb43d1dc72937c028070b106bf53/semmlecode.cpp.dbscheme b/cpp/downgrades/0f0a390468a5eb43d1dc72937c028070b106bf53/semmlecode.cpp.dbscheme
new file mode 100644
index 000000000000..e594389175c0
--- /dev/null
+++ b/cpp/downgrades/0f0a390468a5eb43d1dc72937c028070b106bf53/semmlecode.cpp.dbscheme
@@ -0,0 +1,2444 @@
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+    int id : @externalDataElement,
+    string path : string ref,
+    int column: int ref,
+    string value : string ref
+);
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/**
+ * Information about packages that provide code used during compilation.
+ * The `id` is just a unique identifier.
+ * The `namespace` is typically the name of the package manager that
+ * provided the package (e.g. "dpkg" or "yum").
+ * The `package_name` is the name of the package, and `version` is its
+ * version (as a string).
+ */
+external_packages(
+    unique int id: @external_package,
+    string namespace : string ref,
+    string package_name : string ref,
+    string version : string ref
+);
+
+/**
+ * Holds if File `fileid` was provided by package `package`.
+ */
+header_to_external_package(
+    int fileid : @file ref,
+    int package : @external_package ref
+);
+
+/*
+ * Version history
+ */
+
+svnentries(
+    unique int id : @svnentry,
+    string revision : string ref,
+    string author : string ref,
+    date revisionDate : date ref,
+    int changeSize : int ref
+)
+
+svnaffectedfiles(
+    int id : @svnentry ref,
+    int file : @file ref,
+    string action : string ref
+)
+
+svnentrymsg(
+    unique int id : @svnentry ref,
+    string message : string ref
+)
+
+svnchurn(
+    int commit : @svnentry ref,
+    int file : @file ref,
+    int addedLines : int ref,
+    int deletedLines : int ref
+)
+
+/*
+ * C++ dbscheme
+ */
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+@location = @location_stmt | @location_expr | @location_default ;
+
+/**
+ * The location of an element that is not an expression or a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+    /** The location of an element that is not an expression or a statement. */
+    unique int id: @location_default,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_stmt(
+    /** The location of a statement. */
+    unique int id: @location_stmt,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of an expression.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_expr(
+    /** The location of an expression. */
+    unique int id: @location_expr,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+numlines(
+    int element_id: @sourceline ref,
+    int num_lines: int ref,
+    int num_code: int ref,
+    int num_comment: int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location_default ref
+);
+
+files(
+    unique int id: @file,
+    string name: string ref
+);
+
+folders(
+    unique int id: @folder,
+    string name: string ref
+);
+
+@container = @folder | @file
+
+containerparent(
+    int parent: @container ref,
+    unique int child: @container ref
+);
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+/*
+case @function.kind of
+  1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+| 6 = @builtin_function     // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+*/
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * would change the semantics of this decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+case @usertype.kind of
+|  0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+*/
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      /* TODO | @fixedpointtype */
+      | @routinetype
+      | @ptrtomember
+      | @decltype;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_expr ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_expr ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_stmt ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/* XML Files */
+
+xmlEncoding(unique int id: @file ref, string encoding: string ref);
+
+xmlDTDs(
+    unique int id: @xmldtd,
+    string root: string ref,
+    string publicId: string ref,
+    string systemId: string ref,
+    int fileid: @file ref
+);
+
+xmlElements(
+    unique int id: @xmlelement,
+    string name: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlAttrs(
+    unique int id: @xmlattribute,
+    int elementid: @xmlelement ref,
+    string name: string ref,
+    string value: string ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlNs(
+    int id: @xmlnamespace,
+    string prefixName: string ref,
+    string URI: string ref,
+    int fileid: @file ref
+);
+
+xmlHasNs(
+    int elementId: @xmlnamespaceable ref,
+    int nsId: @xmlnamespace ref,
+    int fileid: @file ref
+);
+
+xmlComments(
+    unique int id: @xmlcomment,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int fileid: @file ref
+);
+
+xmlChars(
+    unique int id: @xmlcharacters,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int isCDATA: int ref,
+    int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+    int xmlElement: @xmllocatable ref,
+    int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters
+              | @xmlelement
+              | @xmlcomment
+              | @xmlattribute
+              | @xmldtd
+              | @file
+              | @xmlnamespace;
diff --git a/cpp/downgrades/0f0a390468a5eb43d1dc72937c028070b106bf53/upgrade.properties b/cpp/downgrades/0f0a390468a5eb43d1dc72937c028070b106bf53/upgrade.properties
new file mode 100644
index 000000000000..92a9acc13277
--- /dev/null
+++ b/cpp/downgrades/0f0a390468a5eb43d1dc72937c028070b106bf53/upgrade.properties
@@ -0,0 +1,3 @@
+description: Add a new predicate `isVla()` to the `ArrayType` class
+compatibility: full
+type_is_vla.rel: delete
\ No newline at end of file
diff --git a/cpp/ql/lib/change-notes/2025-04-14-variable-length-arrays.md b/cpp/ql/lib/change-notes/2025-04-14-variable-length-arrays.md
new file mode 100644
index 000000000000..e7e6cfb849e8
--- /dev/null
+++ b/cpp/ql/lib/change-notes/2025-04-14-variable-length-arrays.md
@@ -0,0 +1,4 @@
+---
+category: feature
+---
+* Added the `isVla()` predicate to the `ArrayType` class. This allows queries to identify variable-length arrays (VLAs).
\ No newline at end of file
diff --git a/cpp/ql/lib/semmle/code/cpp/Type.qll b/cpp/ql/lib/semmle/code/cpp/Type.qll
index 9c33dbec1b59..fbc894a7e075 100644
--- a/cpp/ql/lib/semmle/code/cpp/Type.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Type.qll
@@ -1369,6 +1369,11 @@ class ArrayType extends DerivedType {
   override predicate isDeeplyConst() { this.getBaseType().isDeeplyConst() } // No such thing as a const array type
 
   override predicate isDeeplyConstBelow() { this.getBaseType().isDeeplyConst() }
+
+  /**
+   * Holds if this array is a variable-length array (VLA).
+   */
+  predicate isVla() { type_is_vla(underlyingElement(this)) }
 }
 
 /**
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme b/cpp/ql/lib/semmlecode.cpp.dbscheme
index e594389175c0..0f0a390468a5 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme
@@ -2178,6 +2178,8 @@ variable_vla(
     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
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
index 5f0f15438374..585e8f31e0a1 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
@@ -18,15 +18,15 @@
         </e>
         <e>
             <k>@location_default</k>
-            <v>31650404</v>
+            <v>31650363</v>
         </e>
         <e>
             <k>@location_stmt</k>
-            <v>5202910</v>
+            <v>5202903</v>
         </e>
         <e>
             <k>@location_expr</k>
-            <v>17958942</v>
+            <v>17958919</v>
         </e>
         <e>
             <k>@diagnostic</k>
@@ -42,35 +42,35 @@
         </e>
         <e>
             <k>@macro_expansion</k>
-            <v>40298943</v>
+            <v>40299208</v>
         </e>
         <e>
             <k>@other_macro_reference</k>
-            <v>314182</v>
+            <v>314184</v>
         </e>
         <e>
             <k>@function</k>
-            <v>3356850</v>
+            <v>3356874</v>
         </e>
         <e>
             <k>@fun_decl</k>
-            <v>3388814</v>
+            <v>3388838</v>
         </e>
         <e>
             <k>@var_decl</k>
-            <v>6734234</v>
+            <v>6734225</v>
         </e>
         <e>
             <k>@type_decl</k>
-            <v>1890757</v>
+            <v>1890777</v>
         </e>
         <e>
             <k>@namespace_decl</k>
-            <v>425651</v>
+            <v>425650</v>
         </e>
         <e>
             <k>@using_declaration</k>
-            <v>333243</v>
+            <v>333244</v>
         </e>
         <e>
             <k>@using_directive</k>
@@ -86,15 +86,15 @@
         </e>
         <e>
             <k>@parameter</k>
-            <v>4798833</v>
+            <v>4798867</v>
         </e>
         <e>
             <k>@membervariable</k>
-            <v>1441780</v>
+            <v>1441778</v>
         </e>
         <e>
             <k>@globalvariable</k>
-            <v>425546</v>
+            <v>425545</v>
         </e>
         <e>
             <k>@localvariable</k>
@@ -334,7 +334,7 @@
         </e>
         <e>
             <k>@type_with_specifiers</k>
-            <v>725883</v>
+            <v>725882</v>
         </e>
         <e>
             <k>@array</k>
@@ -342,11 +342,11 @@
         </e>
         <e>
             <k>@routineptr</k>
-            <v>862680</v>
+            <v>862686</v>
         </e>
         <e>
             <k>@reference</k>
-            <v>1024847</v>
+            <v>1024846</v>
         </e>
         <e>
             <k>@gnu_vector</k>
@@ -370,15 +370,15 @@
         </e>
         <e>
             <k>@usertype</k>
-            <v>4992117</v>
+            <v>4987434</v>
         </e>
         <e>
             <k>@mangledname</k>
-            <v>5808009</v>
+            <v>5807194</v>
         </e>
         <e>
             <k>@type_mention</k>
-            <v>5507865</v>
+            <v>5507858</v>
         </e>
         <e>
             <k>@concept_template</k>
@@ -386,7 +386,7 @@
         </e>
         <e>
             <k>@routinetype</k>
-            <v>762063</v>
+            <v>762068</v>
         </e>
         <e>
             <k>@ptrtomember</k>
@@ -394,7 +394,7 @@
         </e>
         <e>
             <k>@specifier</k>
-            <v>7131</v>
+            <v>8341</v>
         </e>
         <e>
             <k>@gnuattribute</k>
@@ -402,11 +402,11 @@
         </e>
         <e>
             <k>@stdattribute</k>
-            <v>346325</v>
+            <v>346324</v>
         </e>
         <e>
             <k>@declspec</k>
-            <v>326925</v>
+            <v>326924</v>
         </e>
         <e>
             <k>@msattribute</k>
@@ -422,7 +422,7 @@
         </e>
         <e>
             <k>@attribute_arg_constant_expr</k>
-            <v>89599</v>
+            <v>89600</v>
         </e>
         <e>
             <k>@attribute_arg_expr</k>
@@ -442,15 +442,15 @@
         </e>
         <e>
             <k>@derivation</k>
-            <v>599880</v>
+            <v>599885</v>
         </e>
         <e>
             <k>@frienddecl</k>
-            <v>883302</v>
+            <v>883308</v>
         </e>
         <e>
             <k>@comment</k>
-            <v>11290145</v>
+            <v>11290131</v>
         </e>
         <e>
             <k>@namespace</k>
@@ -462,15 +462,15 @@
         </e>
         <e>
             <k>@namequalifier</k>
-            <v>3258064</v>
+            <v>3258067</v>
         </e>
         <e>
             <k>@value</k>
-            <v>14099266</v>
+            <v>14099248</v>
         </e>
         <e>
             <k>@initialiser</k>
-            <v>2336673</v>
+            <v>2336670</v>
         </e>
         <e>
             <k>@address_of</k>
@@ -478,19 +478,19 @@
         </e>
         <e>
             <k>@indirect</k>
-            <v>399728</v>
+            <v>399727</v>
         </e>
         <e>
             <k>@array_to_pointer</k>
-            <v>1951449</v>
+            <v>1951447</v>
         </e>
         <e>
             <k>@parexpr</k>
-            <v>4895384</v>
+            <v>4895377</v>
         </e>
         <e>
             <k>@arithnegexpr</k>
-            <v>585843</v>
+            <v>585842</v>
         </e>
         <e>
             <k>@unaryplusexpr</k>
@@ -506,7 +506,7 @@
         </e>
         <e>
             <k>@postincrexpr</k>
-            <v>84817</v>
+            <v>84816</v>
         </e>
         <e>
             <k>@postdecrexpr</k>
@@ -514,7 +514,7 @@
         </e>
         <e>
             <k>@preincrexpr</k>
-            <v>96451</v>
+            <v>96450</v>
         </e>
         <e>
             <k>@predecrexpr</k>
@@ -522,7 +522,7 @@
         </e>
         <e>
             <k>@conditionalexpr</k>
-            <v>896445</v>
+            <v>896444</v>
         </e>
         <e>
             <k>@addexpr</k>
@@ -530,7 +530,7 @@
         </e>
         <e>
             <k>@subexpr</k>
-            <v>466249</v>
+            <v>466248</v>
         </e>
         <e>
             <k>@mulexpr</k>
@@ -538,7 +538,7 @@
         </e>
         <e>
             <k>@divexpr</k>
-            <v>60351</v>
+            <v>60352</v>
         </e>
         <e>
             <k>@remexpr</k>
@@ -546,7 +546,7 @@
         </e>
         <e>
             <k>@paddexpr</k>
-            <v>118344</v>
+            <v>118343</v>
         </e>
         <e>
             <k>@psubexpr</k>
@@ -558,7 +558,7 @@
         </e>
         <e>
             <k>@lshiftexpr</k>
-            <v>610849</v>
+            <v>610848</v>
         </e>
         <e>
             <k>@rshiftexpr</k>
@@ -566,7 +566,7 @@
         </e>
         <e>
             <k>@andexpr</k>
-            <v>536666</v>
+            <v>536665</v>
         </e>
         <e>
             <k>@orexpr</k>
@@ -578,15 +578,15 @@
         </e>
         <e>
             <k>@eqexpr</k>
-            <v>641622</v>
+            <v>641621</v>
         </e>
         <e>
             <k>@neexpr</k>
-            <v>411385</v>
+            <v>411384</v>
         </e>
         <e>
             <k>@gtexpr</k>
-            <v>110847</v>
+            <v>110846</v>
         </e>
         <e>
             <k>@ltexpr</k>
@@ -594,7 +594,7 @@
         </e>
         <e>
             <k>@geexpr</k>
-            <v>80994</v>
+            <v>80993</v>
         </e>
         <e>
             <k>@leexpr</k>
@@ -602,7 +602,7 @@
         </e>
         <e>
             <k>@assignexpr</k>
-            <v>1277660</v>
+            <v>1277658</v>
         </e>
         <e>
             <k>@assignaddexpr</k>
@@ -658,7 +658,7 @@
         </e>
         <e>
             <k>@orlogicalexpr</k>
-            <v>1203319</v>
+            <v>1203317</v>
         </e>
         <e>
             <k>@commaexpr</k>
@@ -666,11 +666,11 @@
         </e>
         <e>
             <k>@subscriptexpr</k>
-            <v>433959</v>
+            <v>433958</v>
         </e>
         <e>
             <k>@callexpr</k>
-            <v>302410</v>
+            <v>302370</v>
         </e>
         <e>
             <k>@vastartexpr</k>
@@ -690,15 +690,15 @@
         </e>
         <e>
             <k>@varaccess</k>
-            <v>8226118</v>
+            <v>8226107</v>
         </e>
         <e>
             <k>@runtime_sizeof</k>
-            <v>397856</v>
+            <v>397855</v>
         </e>
         <e>
             <k>@runtime_alignof</k>
-            <v>61478</v>
+            <v>61479</v>
         </e>
         <e>
             <k>@expr_stmt</k>
@@ -706,11 +706,11 @@
         </e>
         <e>
             <k>@routineexpr</k>
-            <v>6144464</v>
+            <v>6144489</v>
         </e>
         <e>
             <k>@type_operand</k>
-            <v>1532455</v>
+            <v>1532453</v>
         </e>
         <e>
             <k>@offsetofexpr</k>
@@ -718,11 +718,11 @@
         </e>
         <e>
             <k>@typescompexpr</k>
-            <v>765413</v>
+            <v>765411</v>
         </e>
         <e>
             <k>@literal</k>
-            <v>6101418</v>
+            <v>6101411</v>
         </e>
         <e>
             <k>@aggregateliteral</k>
@@ -730,11 +730,11 @@
         </e>
         <e>
             <k>@c_style_cast</k>
-            <v>6024777</v>
+            <v>6024778</v>
         </e>
         <e>
             <k>@temp_init</k>
-            <v>1075849</v>
+            <v>1076139</v>
         </e>
         <e>
             <k>@errorexpr</k>
@@ -742,11 +742,11 @@
         </e>
         <e>
             <k>@reference_to</k>
-            <v>2194465</v>
+            <v>2194481</v>
         </e>
         <e>
             <k>@ref_indirect</k>
-            <v>2657383</v>
+            <v>2657402</v>
         </e>
         <e>
             <k>@vacuous_destructor_call</k>
@@ -806,11 +806,11 @@
         </e>
         <e>
             <k>@thisaccess</k>
-            <v>1525361</v>
+            <v>1525359</v>
         </e>
         <e>
             <k>@new_expr</k>
-            <v>58256</v>
+            <v>58257</v>
         </e>
         <e>
             <k>@delete_expr</k>
@@ -818,19 +818,19 @@
         </e>
         <e>
             <k>@throw_expr</k>
-            <v>26214</v>
+            <v>26159</v>
         </e>
         <e>
             <k>@condition_decl</k>
-            <v>438290</v>
+            <v>438294</v>
         </e>
         <e>
             <k>@braced_init_list</k>
-            <v>2334</v>
+            <v>2335</v>
         </e>
         <e>
             <k>@type_id</k>
-            <v>60404</v>
+            <v>60405</v>
         </e>
         <e>
             <k>@sizeof_pack</k>
@@ -922,7 +922,7 @@
         </e>
         <e>
             <k>@uuidof</k>
-            <v>27728</v>
+            <v>27727</v>
         </e>
         <e>
             <k>@delete_array_expr</k>
@@ -938,7 +938,7 @@
         </e>
         <e>
             <k>@ctordirectinit</k>
-            <v>142247</v>
+            <v>142248</v>
         </e>
         <e>
             <k>@ctorvirtualinit</k>
@@ -946,7 +946,7 @@
         </e>
         <e>
             <k>@ctorfieldinit</k>
-            <v>259362</v>
+            <v>259364</v>
         </e>
         <e>
             <k>@ctordelegatinginit</k>
@@ -962,11 +962,11 @@
         </e>
         <e>
             <k>@dtorfielddestruct</k>
-            <v>50222</v>
+            <v>50223</v>
         </e>
         <e>
             <k>@static_cast</k>
-            <v>335478</v>
+            <v>335479</v>
         </e>
         <e>
             <k>@reinterpret_cast</k>
@@ -986,7 +986,7 @@
         </e>
         <e>
             <k>@param_ref</k>
-            <v>177918</v>
+            <v>177993</v>
         </e>
         <e>
             <k>@noopexpr</k>
@@ -1090,7 +1090,7 @@
         </e>
         <e>
             <k>@noexceptexpr</k>
-            <v>30759</v>
+            <v>30772</v>
         </e>
         <e>
             <k>@builtinshufflevector</k>
@@ -1262,7 +1262,7 @@
         </e>
         <e>
             <k>@reuseexpr</k>
-            <v>907876</v>
+            <v>907883</v>
         </e>
         <e>
             <k>@istriviallycopyassignable</k>
@@ -1382,11 +1382,11 @@
         </e>
         <e>
             <k>@stmt_expr</k>
-            <v>2026088</v>
+            <v>2026085</v>
         </e>
         <e>
             <k>@stmt_if</k>
-            <v>987521</v>
+            <v>987520</v>
         </e>
         <e>
             <k>@stmt_while</k>
@@ -1394,7 +1394,7 @@
         </e>
         <e>
             <k>@stmt_goto</k>
-            <v>151172</v>
+            <v>151171</v>
         </e>
         <e>
             <k>@stmt_label</k>
@@ -1402,11 +1402,11 @@
         </e>
         <e>
             <k>@stmt_return</k>
-            <v>1515834</v>
+            <v>1515845</v>
         </e>
         <e>
             <k>@stmt_block</k>
-            <v>1897791</v>
+            <v>1897789</v>
         </e>
         <e>
             <k>@stmt_end_test_while</k>
@@ -1418,11 +1418,11 @@
         </e>
         <e>
             <k>@stmt_switch_case</k>
-            <v>896207</v>
+            <v>896214</v>
         </e>
         <e>
             <k>@stmt_switch</k>
-            <v>441450</v>
+            <v>441453</v>
         </e>
         <e>
             <k>@stmt_asm</k>
@@ -1430,11 +1430,11 @@
         </e>
         <e>
             <k>@stmt_decl</k>
-            <v>770893</v>
+            <v>770895</v>
         </e>
         <e>
             <k>@stmt_empty</k>
-            <v>460245</v>
+            <v>460249</v>
         </e>
         <e>
             <k>@stmt_continue</k>
@@ -1442,11 +1442,11 @@
         </e>
         <e>
             <k>@stmt_break</k>
-            <v>140999</v>
+            <v>140998</v>
         </e>
         <e>
             <k>@stmt_try_block</k>
-            <v>29027</v>
+            <v>28973</v>
         </e>
         <e>
             <k>@stmt_microsoft_try</k>
@@ -1470,7 +1470,7 @@
         </e>
         <e>
             <k>@stmt_handler</k>
-            <v>47521</v>
+            <v>47475</v>
         </e>
         <e>
             <k>@stmt_constexpr_if</k>
@@ -1490,7 +1490,7 @@
         </e>
         <e>
             <k>@ppd_if</k>
-            <v>511549</v>
+            <v>511548</v>
         </e>
         <e>
             <k>@ppd_ifdef</k>
@@ -1498,7 +1498,7 @@
         </e>
         <e>
             <k>@ppd_ifndef</k>
-            <v>154178</v>
+            <v>154177</v>
         </e>
         <e>
             <k>@ppd_elif</k>
@@ -1506,19 +1506,19 @@
         </e>
         <e>
             <k>@ppd_else</k>
-            <v>241109</v>
+            <v>241108</v>
         </e>
         <e>
             <k>@ppd_endif</k>
-            <v>846303</v>
+            <v>846302</v>
         </e>
         <e>
             <k>@ppd_plain_include</k>
-            <v>401967</v>
+            <v>408579</v>
         </e>
         <e>
             <k>@ppd_define</k>
-            <v>3130381</v>
+            <v>3130376</v>
         </e>
         <e>
             <k>@ppd_undef</k>
@@ -1558,7 +1558,7 @@
         </e>
         <e>
             <k>@ppd_warning</k>
-            <v>6</v>
+            <v>13</v>
         </e>
         <e>
             <k>@link_target</k>
@@ -1640,7 +1640,7 @@
         </relation>
         <relation>
             <name>compilation_args</name>
-            <cardinality>1298224</cardinality>
+            <cardinality>1298229</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -1985,7 +1985,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>16269</v>
+                                    <v>16270</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -2221,7 +2221,7 @@
                 </e>
                 <e>
                     <k>seconds</k>
-                    <v>17489</v>
+                    <v>17407</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2267,7 +2267,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>203</v>
+                                    <v>149</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -2277,7 +2277,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>7667</v>
+                                    <v>7721</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2323,8 +2323,8 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1291</a>
-                                    <b>1292</b>
+                                    <a>1285</a>
+                                    <b>1286</b>
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -2381,13 +2381,13 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>714</a>
-                                    <b>715</b>
+                                    <a>718</a>
+                                    <b>719</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>787</a>
-                                    <b>788</b>
+                                    <a>769</a>
+                                    <b>770</b>
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -2404,27 +2404,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10891</v>
+                                    <v>10837</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3806</v>
+                                    <v>3617</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1463</v>
+                                    <v>1368</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>662</b>
-                                    <v>1314</v>
+                                    <b>10</b>
+                                    <v>1327</v>
                                 </b>
                                 <b>
-                                    <a>689</a>
-                                    <b>690</b>
-                                    <v>13</v>
+                                    <a>10</a>
+                                    <b>694</b>
+                                    <v>257</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2440,7 +2440,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17489</v>
+                                    <v>17407</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2461,12 +2461,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3048</v>
+                                    <v>2980</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>5</b>
-                                    <v>27</v>
+                                    <b>4</b>
+                                    <v>13</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2730,11 +2730,11 @@
                 </e>
                 <e>
                     <k>cpu_seconds</k>
-                    <v>11921</v>
+                    <v>12083</v>
                 </e>
                 <e>
                     <k>elapsed_seconds</k>
-                    <v>243</v>
+                    <v>257</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2780,17 +2780,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9916</v>
+                                    <v>10241</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1354</v>
+                                    <v>1246</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>42</b>
-                                    <v>650</v>
+                                    <b>35</b>
+                                    <v>596</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2806,12 +2806,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11054</v>
+                                    <v>11365</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>867</v>
+                                    <v>717</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2827,66 +2827,61 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40</v>
+                                    <v>67</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>27</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>8</b>
+                                    <a>3</a>
+                                    <b>4</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
-                                    <b>10</b>
-                                    <v>27</v>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>13</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>13</v>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>54</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>21</b>
-                                    <v>27</v>
+                                    <v>13</v>
                                 </b>
                                 <b>
-                                    <a>24</a>
-                                    <b>25</b>
+                                    <a>31</a>
+                                    <b>32</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>46</a>
-                                    <b>47</b>
+                                    <a>43</a>
+                                    <b>44</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>128</a>
-                                    <b>129</b>
+                                    <a>127</a>
+                                    <b>128</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>275</a>
-                                    <b>276</b>
+                                    <a>265</a>
+                                    <b>266</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>306</a>
-                                    <b>307</b>
+                                    <a>321</a>
+                                    <b>322</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>331</a>
-                                    <b>332</b>
+                                    <a>330</a>
+                                    <b>331</b>
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -2903,61 +2898,61 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40</v>
+                                    <v>67</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>27</v>
+                                    <v>13</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>6</b>
+                                    <a>3</a>
+                                    <b>4</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>8</b>
+                                    <a>6</a>
+                                    <b>7</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
-                                    <b>10</b>
-                                    <v>40</v>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>54</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>21</b>
-                                    <v>27</v>
+                                    <v>13</v>
                                 </b>
                                 <b>
-                                    <a>24</a>
-                                    <b>25</b>
+                                    <a>31</a>
+                                    <b>32</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>46</a>
-                                    <b>47</b>
+                                    <a>43</a>
+                                    <b>44</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>122</a>
-                                    <b>123</b>
+                                    <a>120</a>
+                                    <b>121</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>166</a>
-                                    <b>167</b>
+                                    <a>171</a>
+                                    <b>172</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>248</a>
-                                    <b>249</b>
+                                    <a>233</a>
+                                    <b>234</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>252</a>
-                                    <b>253</b>
+                                    <a>267</a>
+                                    <b>268</b>
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -4730,11 +4725,11 @@
         </relation>
         <relation>
             <name>locations_default</name>
-            <cardinality>31650404</cardinality>
+            <cardinality>31650363</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>31650404</v>
+                    <v>31650363</v>
                 </e>
                 <e>
                     <k>container</k>
@@ -4742,7 +4737,7 @@
                 </e>
                 <e>
                     <k>startLine</k>
-                    <v>7709299</v>
+                    <v>7709289</v>
                 </e>
                 <e>
                     <k>startColumn</k>
@@ -4750,7 +4745,7 @@
                 </e>
                 <e>
                     <k>endLine</k>
-                    <v>7708627</v>
+                    <v>7708617</v>
                 </e>
                 <e>
                     <k>endColumn</k>
@@ -4768,7 +4763,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31650404</v>
+                                    <v>31650363</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4784,7 +4779,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31650404</v>
+                                    <v>31650363</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4800,7 +4795,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31650404</v>
+                                    <v>31650363</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4816,7 +4811,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31650404</v>
+                                    <v>31650363</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4832,7 +4827,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31650404</v>
+                                    <v>31650363</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5233,27 +5228,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5187073</v>
+                                    <v>5187066</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>787640</v>
+                                    <v>787639</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>633853</v>
+                                    <v>633852</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>10</b>
-                                    <v>618380</v>
+                                    <v>618379</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>414</b>
-                                    <v>482352</v>
+                                    <v>482351</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5269,17 +5264,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5247619</v>
+                                    <v>5247612</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1198817</v>
+                                    <v>1198816</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>636005</v>
+                                    <v>636004</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -5305,7 +5300,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5929506</v>
+                                    <v>5929498</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5315,7 +5310,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>581379</v>
+                                    <v>581378</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -5341,12 +5336,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7561432</v>
+                                    <v>7558596</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>82</b>
-                                    <v>147867</v>
+                                    <v>150692</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5362,17 +5357,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5256096</v>
+                                    <v>5256089</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>764364</v>
+                                    <v>764363</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>626991</v>
+                                    <v>626990</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -5685,7 +5680,7 @@
                                 </b>
                                 <b>
                                     <a>2521</a>
-                                    <b>56781</b>
+                                    <b>56782</b>
                                     <v>807</v>
                                 </b>
                             </bs>
@@ -5778,27 +5773,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5183440</v>
+                                    <v>5183433</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>792888</v>
+                                    <v>792752</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>630623</v>
+                                    <v>630892</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>579630</v>
+                                    <v>579495</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>412</b>
-                                    <v>522044</v>
+                                    <v>522043</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5814,27 +5809,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5242910</v>
+                                    <v>5242903</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1200970</v>
+                                    <v>1200968</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>638831</v>
+                                    <v>638830</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>54</b>
-                                    <v>579495</v>
+                                    <v>579629</v>
                                 </b>
                                 <b>
                                     <a>54</a>
                                     <b>312</b>
-                                    <v>46418</v>
+                                    <v>46284</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5850,12 +5845,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7548112</v>
+                                    <v>7545276</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>160515</v>
+                                    <v>163340</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5871,22 +5866,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5929640</v>
+                                    <v>5929632</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>579092</v>
+                                    <v>578956</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>581379</v>
+                                    <v>581513</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>42</b>
-                                    <v>578957</v>
+                                    <v>578956</v>
                                 </b>
                                 <b>
                                     <a>42</a>
@@ -5907,27 +5902,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5253136</v>
+                                    <v>5253129</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>768938</v>
+                                    <v>768803</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>623761</v>
+                                    <v>624030</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>10</b>
-                                    <v>600619</v>
+                                    <v>600484</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>225</b>
-                                    <v>462170</v>
+                                    <v>462169</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6257,11 +6252,11 @@
         </relation>
         <relation>
             <name>locations_stmt</name>
-            <cardinality>5202910</cardinality>
+            <cardinality>5202903</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5202910</v>
+                    <v>5202903</v>
                 </e>
                 <e>
                     <k>container</k>
@@ -6269,7 +6264,7 @@
                 </e>
                 <e>
                     <k>startLine</k>
-                    <v>272852</v>
+                    <v>272851</v>
                 </e>
                 <e>
                     <k>startColumn</k>
@@ -6295,7 +6290,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5202910</v>
+                                    <v>5202903</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6311,7 +6306,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5202910</v>
+                                    <v>5202903</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6327,7 +6322,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5202910</v>
+                                    <v>5202903</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6343,7 +6338,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5202910</v>
+                                    <v>5202903</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6359,7 +6354,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5202910</v>
+                                    <v>5202903</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8249,11 +8244,11 @@
         </relation>
         <relation>
             <name>locations_expr</name>
-            <cardinality>17958942</cardinality>
+            <cardinality>17958919</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>17958942</v>
+                    <v>17958919</v>
                 </e>
                 <e>
                     <k>container</k>
@@ -8261,7 +8256,7 @@
                 </e>
                 <e>
                     <k>startLine</k>
-                    <v>262020</v>
+                    <v>262019</v>
                 </e>
                 <e>
                     <k>startColumn</k>
@@ -8269,7 +8264,7 @@
                 </e>
                 <e>
                     <k>endLine</k>
-                    <v>261992</v>
+                    <v>261991</v>
                 </e>
                 <e>
                     <k>endColumn</k>
@@ -8287,7 +8282,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17958942</v>
+                                    <v>17958919</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8303,7 +8298,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17958942</v>
+                                    <v>17958919</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8319,7 +8314,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17958942</v>
+                                    <v>17958919</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8335,7 +8330,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17958942</v>
+                                    <v>17958919</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8351,7 +8346,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17958942</v>
+                                    <v>17958919</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8995,7 +8990,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>37688</v>
+                                    <v>37687</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -9634,7 +9629,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>68220</v>
+                                    <v>68219</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -10176,11 +10171,11 @@
         </relation>
         <relation>
             <name>numlines</name>
-            <cardinality>860969</cardinality>
+            <cardinality>860968</cardinality>
             <columnsizes>
                 <e>
                     <k>element_id</k>
-                    <v>859623</v>
+                    <v>859622</v>
                 </e>
                 <e>
                     <k>num_lines</k>
@@ -10206,7 +10201,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>858278</v>
+                                    <v>858277</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10227,7 +10222,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>858278</v>
+                                    <v>858277</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10248,7 +10243,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>859354</v>
+                                    <v>859353</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11260,7 +11255,7 @@
         </relation>
         <relation>
             <name>containerparent</name>
-            <cardinality>99502</cardinality>
+            <cardinality>99503</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
@@ -11268,7 +11263,7 @@
                 </e>
                 <e>
                     <k>child</k>
-                    <v>99502</v>
+                    <v>99503</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11333,7 +11328,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>99502</v>
+                                    <v>99503</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11343,7 +11338,7 @@
         </relation>
         <relation>
             <name>fileannotations</name>
-            <cardinality>5387460</cardinality>
+            <cardinality>5387479</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -11355,7 +11350,7 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>75307</v>
+                    <v>75308</v>
                 </e>
                 <e>
                     <k>value</k>
@@ -11675,7 +11670,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>75307</v>
+                                    <v>75308</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11797,7 +11792,7 @@
                                 <b>
                                     <a>51</a>
                                     <b>58</b>
-                                    <v>3887</v>
+                                    <v>3888</v>
                                 </b>
                                 <b>
                                     <a>58</a>
@@ -11838,7 +11833,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>50665</v>
+                                    <v>50666</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11919,7 +11914,7 @@
                                 <b>
                                     <a>113</a>
                                     <b>145</b>
-                                    <v>3887</v>
+                                    <v>3888</v>
                                 </b>
                                 <b>
                                     <a>145</a>
@@ -11934,15 +11929,15 @@
         </relation>
         <relation>
             <name>inmacroexpansion</name>
-            <cardinality>149742415</cardinality>
+            <cardinality>149742219</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>24596921</v>
+                    <v>24596888</v>
                 </e>
                 <e>
                     <k>inv</k>
-                    <v>3698101</v>
+                    <v>3698096</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11956,32 +11951,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>3</b>
-                                    <v>2167550</v>
+                                    <v>2167547</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>1469288</v>
+                                    <v>1469286</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>1617557</v>
+                                    <v>1617555</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>6574000</v>
+                                    <v>6573991</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>8708728</v>
+                                    <v>8708717</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>3552858</v>
+                                    <v>3552853</v>
                                 </b>
                                 <b>
                                     <a>9</a>
@@ -12007,12 +12002,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>743635</v>
+                                    <v>743634</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>479645</v>
+                                    <v>479644</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -12022,7 +12017,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>282496</v>
+                                    <v>282495</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -12042,12 +12037,12 @@
                                 <b>
                                     <a>11</a>
                                     <b>337</b>
-                                    <v>306935</v>
+                                    <v>306934</v>
                                 </b>
                                 <b>
                                     <a>339</a>
                                     <b>423</b>
-                                    <v>281412</v>
+                                    <v>281411</v>
                                 </b>
                                 <b>
                                     <a>423</a>
@@ -12062,15 +12057,15 @@
         </relation>
         <relation>
             <name>affectedbymacroexpansion</name>
-            <cardinality>48676789</cardinality>
+            <cardinality>48676725</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7035609</v>
+                    <v>7035600</v>
                 </e>
                 <e>
                     <k>inv</k>
-                    <v>3798618</v>
+                    <v>3798613</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12084,12 +12079,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3842147</v>
+                                    <v>3842142</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>764600</v>
+                                    <v>764599</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -12099,7 +12094,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>771826</v>
+                                    <v>771825</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -12109,12 +12104,12 @@
                                 <b>
                                     <a>12</a>
                                     <b>50</b>
-                                    <v>555612</v>
+                                    <v>555611</v>
                                 </b>
                                 <b>
                                     <a>50</a>
                                     <b>9900</b>
-                                    <v>205477</v>
+                                    <v>205476</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12145,22 +12140,22 @@
                                 <b>
                                     <a>9</a>
                                     <b>12</b>
-                                    <v>342529</v>
+                                    <v>342528</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>13</b>
-                                    <v>455467</v>
+                                    <v>455466</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>225833</v>
+                                    <v>225832</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>15</b>
-                                    <v>407558</v>
+                                    <v>407557</v>
                                 </b>
                                 <b>
                                     <a>15</a>
@@ -12180,12 +12175,12 @@
                                 <b>
                                     <a>18</a>
                                     <b>20</b>
-                                    <v>343850</v>
+                                    <v>343849</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>25</b>
-                                    <v>285057</v>
+                                    <v>285056</v>
                                 </b>
                                 <b>
                                     <a>25</a>
@@ -12200,19 +12195,19 @@
         </relation>
         <relation>
             <name>macroinvocations</name>
-            <cardinality>40601028</cardinality>
+            <cardinality>40601294</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>40601028</v>
+                    <v>40601294</v>
                 </e>
                 <e>
                     <k>macro_id</k>
-                    <v>109906</v>
+                    <v>109907</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>1070092</v>
+                    <v>1070096</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -12230,7 +12225,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40601028</v>
+                                    <v>40601294</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12246,7 +12241,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40601028</v>
+                                    <v>40601294</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12262,7 +12257,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40601028</v>
+                                    <v>40601294</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12406,32 +12401,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>426609</v>
+                                    <v>426610</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>252746</v>
+                                    <v>252707</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>113185</v>
+                                    <v>113199</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>77475</v>
+                                    <v>77502</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>11</b>
-                                    <v>82758</v>
+                                    <v>82759</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>42</b>
-                                    <v>80455</v>
+                                    <v>80456</v>
                                 </b>
                                 <b>
                                     <a>42</a>
@@ -12452,12 +12447,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1009645</v>
+                                    <v>1009649</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>367</b>
-                                    <v>60446</v>
+                                    <v>60447</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12473,7 +12468,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1070092</v>
+                                    <v>1070096</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12492,8 +12487,8 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>2974746</a>
-                                    <b>2974747</b>
+                                    <a>2974755</a>
+                                    <b>2974756</b>
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -12546,15 +12541,15 @@
         </relation>
         <relation>
             <name>macroparent</name>
-            <cardinality>35810829</cardinality>
+            <cardinality>35811023</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>35810829</v>
+                    <v>35811023</v>
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>28059915</v>
+                    <v>28060082</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12568,7 +12563,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>35810829</v>
+                                    <v>35811023</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12584,17 +12579,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21857859</v>
+                                    <v>21858004</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5174257</v>
+                                    <v>5174275</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>91</b>
-                                    <v>1027798</v>
+                                    <v>1027802</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12604,15 +12599,15 @@
         </relation>
         <relation>
             <name>macrolocationbind</name>
-            <cardinality>5543856</cardinality>
+            <cardinality>5543848</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3882187</v>
+                    <v>3882182</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2758860</v>
+                    <v>2758856</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12626,17 +12621,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3056762</v>
+                                    <v>3056758</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>469909</v>
+                                    <v>469908</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>314962</v>
+                                    <v>314961</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -12657,12 +12652,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2198775</v>
+                                    <v>2198772</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>239730</v>
+                                    <v>239729</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -12682,11 +12677,11 @@
         </relation>
         <relation>
             <name>macro_argument_unexpanded</name>
-            <cardinality>103251986</cardinality>
+            <cardinality>103252337</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>31225989</v>
+                    <v>31226086</v>
                 </e>
                 <e>
                     <k>argument_index</k>
@@ -12694,7 +12689,7 @@
                 </e>
                 <e>
                     <k>text</k>
-                    <v>440264</v>
+                    <v>440266</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12708,22 +12703,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9979439</v>
+                                    <v>9979461</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12505023</v>
+                                    <v>12505068</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6395493</v>
+                                    <v>6395516</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>2346032</v>
+                                    <v>2346040</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12739,22 +12734,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10213680</v>
+                                    <v>10213703</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12526522</v>
+                                    <v>12526567</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6195580</v>
+                                    <v>6195602</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>2290205</v>
+                                    <v>2290213</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12779,7 +12774,7 @@
                                 </b>
                                 <b>
                                     <a>645273</a>
-                                    <b>2305009</b>
+                                    <b>2305008</b>
                                     <v>40</v>
                                 </b>
                             </bs>
@@ -12852,7 +12847,7 @@
                                 <b>
                                     <a>9</a>
                                     <b>15</b>
-                                    <v>36847</v>
+                                    <v>36848</v>
                                 </b>
                                 <b>
                                     <a>15</a>
@@ -12862,7 +12857,7 @@
                                 <b>
                                     <a>27</a>
                                     <b>57</b>
-                                    <v>34124</v>
+                                    <v>34125</v>
                                 </b>
                                 <b>
                                     <a>57</a>
@@ -12888,17 +12883,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>311893</v>
+                                    <v>311894</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>115271</v>
+                                    <v>115272</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>13099</v>
+                                    <v>13100</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12908,11 +12903,11 @@
         </relation>
         <relation>
             <name>macro_argument_expanded</name>
-            <cardinality>103251986</cardinality>
+            <cardinality>103252337</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>31225989</v>
+                    <v>31226086</v>
                 </e>
                 <e>
                     <k>argument_index</k>
@@ -12920,7 +12915,7 @@
                 </e>
                 <e>
                     <k>text</k>
-                    <v>266686</v>
+                    <v>266687</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12934,22 +12929,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9979439</v>
+                                    <v>9979461</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12505023</v>
+                                    <v>12505068</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6395493</v>
+                                    <v>6395516</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>2346032</v>
+                                    <v>2346040</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12965,22 +12960,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13763081</v>
+                                    <v>13763116</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10789713</v>
+                                    <v>10789751</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5403974</v>
+                                    <v>5403993</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>1269220</v>
+                                    <v>1269224</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13005,7 +13000,7 @@
                                 </b>
                                 <b>
                                     <a>645273</a>
-                                    <b>2305009</b>
+                                    <b>2305008</b>
                                     <v>40</v>
                                 </b>
                             </bs>
@@ -13119,7 +13114,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>114038</v>
+                                    <v>114039</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -13134,15 +13129,15 @@
         </relation>
         <relation>
             <name>functions</name>
-            <cardinality>3356850</cardinality>
+            <cardinality>3356874</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3356850</v>
+                    <v>3356874</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>466655</v>
+                    <v>466658</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -13160,7 +13155,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3356850</v>
+                                    <v>3356874</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13176,7 +13171,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3356850</v>
+                                    <v>3356874</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13192,12 +13187,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>372696</v>
+                                    <v>372699</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>31834</v>
+                                    <v>31835</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -13223,7 +13218,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>465409</v>
+                                    <v>465412</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13340,15 +13335,15 @@
         </relation>
         <relation>
             <name>function_entry_point</name>
-            <cardinality>1438631</cardinality>
+            <cardinality>1438642</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1433905</v>
+                    <v>1433916</v>
                 </e>
                 <e>
                     <k>entry_point</k>
-                    <v>1438631</v>
+                    <v>1438642</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13362,7 +13357,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1429867</v>
+                                    <v>1429877</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13383,7 +13378,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1438631</v>
+                                    <v>1438642</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13393,15 +13388,15 @@
         </relation>
         <relation>
             <name>function_return_type</name>
-            <cardinality>3363165</cardinality>
+            <cardinality>3363190</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3356850</v>
+                    <v>3356874</v>
                 </e>
                 <e>
                     <k>return_type</k>
-                    <v>631801</v>
+                    <v>631806</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13415,7 +13410,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3351050</v>
+                                    <v>3351074</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13436,7 +13431,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>436968</v>
+                                    <v>436971</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13742,33 +13737,33 @@
         </relation>
         <relation>
             <name>function_deleted</name>
-            <cardinality>94415</cardinality>
+            <cardinality>94416</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>94415</v>
+                    <v>94416</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_defaulted</name>
-            <cardinality>55394</cardinality>
+            <cardinality>55395</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>55394</v>
+                    <v>55395</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_prototyped</name>
-            <cardinality>3352726</cardinality>
+            <cardinality>3352750</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3352726</v>
+                    <v>3352750</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -13848,15 +13843,15 @@
         </relation>
         <relation>
             <name>member_function_this_type</name>
-            <cardinality>674420</cardinality>
+            <cardinality>674425</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>674420</v>
+                    <v>674425</v>
                 </e>
                 <e>
                     <k>this_type</k>
-                    <v>233542</v>
+                    <v>233544</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13870,7 +13865,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>674420</v>
+                                    <v>674425</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13896,7 +13891,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>36517</v>
+                                    <v>36518</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -13921,27 +13916,27 @@
         </relation>
         <relation>
             <name>fun_decls</name>
-            <cardinality>3392723</cardinality>
+            <cardinality>3392748</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3388814</v>
+                    <v>3388838</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>3232260</v>
+                    <v>3232283</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>600783</v>
+                    <v>600787</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>462015</v>
+                    <v>462018</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>932365</v>
+                    <v>932372</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13955,7 +13950,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3388814</v>
+                                    <v>3388838</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13971,7 +13966,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3385420</v>
+                                    <v>3385444</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13992,7 +13987,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3388814</v>
+                                    <v>3388838</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14008,7 +14003,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3388814</v>
+                                    <v>3388838</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14024,12 +14019,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3101869</v>
+                                    <v>3101892</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>130390</v>
+                                    <v>130391</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14045,7 +14040,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3221906</v>
+                                    <v>3221929</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14066,7 +14061,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3232260</v>
+                                    <v>3232283</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14082,12 +14077,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3146937</v>
+                                    <v>3146959</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>85322</v>
+                                    <v>85323</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14103,12 +14098,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>397056</v>
+                                    <v>397059</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>127253</v>
+                                    <v>127254</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -14134,17 +14129,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>415401</v>
+                                    <v>415404</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>112732</v>
+                                    <v>112733</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>52284</v>
+                                    <v>52285</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -14165,7 +14160,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>472627</v>
+                                    <v>472630</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14196,17 +14191,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>441307</v>
+                                    <v>441310</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>90220</v>
+                                    <v>90221</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>51382</v>
+                                    <v>51383</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -14227,7 +14222,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347650</v>
+                                    <v>347652</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14237,7 +14232,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>37591</v>
+                                    <v>37592</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -14263,12 +14258,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>369345</v>
+                                    <v>369348</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>32049</v>
+                                    <v>32050</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -14278,7 +14273,7 @@
                                 <b>
                                     <a>9</a>
                                     <b>4900</b>
-                                    <v>25003</v>
+                                    <v>25004</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14294,7 +14289,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>427516</v>
+                                    <v>427519</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14315,7 +14310,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>355512</v>
+                                    <v>355514</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14346,17 +14341,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>736887</v>
+                                    <v>736892</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>90263</v>
+                                    <v>90264</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>13</b>
-                                    <v>70629</v>
+                                    <v>70630</v>
                                 </b>
                                 <b>
                                     <a>13</a>
@@ -14377,17 +14372,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>777787</v>
+                                    <v>777793</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>73250</v>
+                                    <v>73251</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>66</b>
-                                    <v>71016</v>
+                                    <v>71017</v>
                                 </b>
                                 <b>
                                     <a>66</a>
@@ -14408,7 +14403,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>854388</v>
+                                    <v>854395</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14434,7 +14429,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>884763</v>
+                                    <v>884769</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14449,11 +14444,11 @@
         </relation>
         <relation>
             <name>fun_def</name>
-            <cardinality>1592178</cardinality>
+            <cardinality>1592190</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1592178</v>
+                    <v>1592190</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -14482,15 +14477,15 @@
         </relation>
         <relation>
             <name>fun_decl_specifiers</name>
-            <cardinality>1763135</cardinality>
+            <cardinality>2464552</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1197760</v>
+                    <v>1197759</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>218</v>
+                    <v>327</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14504,17 +14499,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>640797</v>
+                                    <v>267558</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>548552</v>
+                                    <v>596777</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>8410</v>
+                                    <v>330256</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>3167</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14537,6 +14537,16 @@
                                     <b>2862</b>
                                     <v>54</v>
                                 </b>
+                                <b>
+                                    <a>6284</a>
+                                    <b>6285</b>
+                                    <v>54</v>
+                                </b>
+                                <b>
+                                    <a>6559</a>
+                                    <b>6560</b>
+                                    <v>54</v>
+                                </b>
                                 <b>
                                     <a>6738</a>
                                     <b>6739</b>
@@ -14676,26 +14686,26 @@
         </relation>
         <relation>
             <name>fun_decl_empty_throws</name>
-            <cardinality>435235</cardinality>
+            <cardinality>435234</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>435235</v>
+                    <v>435234</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>fun_decl_noexcept</name>
-            <cardinality>178851</cardinality>
+            <cardinality>178852</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>178851</v>
+                    <v>178852</v>
                 </e>
                 <e>
                     <k>constant</k>
-                    <v>178336</v>
+                    <v>178251</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14709,7 +14719,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>178851</v>
+                                    <v>178852</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14725,12 +14735,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>177863</v>
+                                    <v>177692</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>472</v>
+                                    <v>558</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14740,11 +14750,11 @@
         </relation>
         <relation>
             <name>fun_decl_empty_noexcept</name>
-            <cardinality>1063866</cardinality>
+            <cardinality>1063865</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>1063866</v>
+                    <v>1063865</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -14861,7 +14871,7 @@
                 </e>
                 <e>
                     <k>constraint</k>
-                    <v>30949</v>
+                    <v>30948</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -15000,7 +15010,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30949</v>
+                                    <v>30948</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15010,11 +15020,11 @@
         </relation>
         <relation>
             <name>param_decl_bind</name>
-            <cardinality>4870837</cardinality>
+            <cardinality>4870873</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4870837</v>
+                    <v>4870873</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -15022,7 +15032,7 @@
                 </e>
                 <e>
                     <k>fun_decl</k>
-                    <v>2664643</v>
+                    <v>2664662</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -15036,7 +15046,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4870837</v>
+                                    <v>4870873</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15052,7 +15062,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4870837</v>
+                                    <v>4870873</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15230,22 +15240,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1370794</v>
+                                    <v>1370804</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>667761</v>
+                                    <v>667766</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>448997</v>
+                                    <v>449001</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>21</b>
-                                    <v>177090</v>
+                                    <v>177091</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15261,22 +15271,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1370794</v>
+                                    <v>1370804</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>667761</v>
+                                    <v>667766</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>448997</v>
+                                    <v>449001</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>21</b>
-                                    <v>177090</v>
+                                    <v>177091</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15286,27 +15296,27 @@
         </relation>
         <relation>
             <name>var_decls</name>
-            <cardinality>6739212</cardinality>
+            <cardinality>6739203</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6734234</v>
+                    <v>6734225</v>
                 </e>
                 <e>
                     <k>variable</k>
-                    <v>6565781</v>
+                    <v>6565772</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1513120</v>
+                    <v>1513118</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>829081</v>
+                    <v>829080</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>3605468</v>
+                    <v>3605463</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -15320,7 +15330,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6734234</v>
+                                    <v>6734225</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15336,7 +15346,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6729256</v>
+                                    <v>6729247</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15357,7 +15367,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6734234</v>
+                                    <v>6734225</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15373,7 +15383,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6734234</v>
+                                    <v>6734225</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15389,7 +15399,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6408495</v>
+                                    <v>6408486</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15410,7 +15420,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6551250</v>
+                                    <v>6551241</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15431,7 +15441,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6548559</v>
+                                    <v>6548550</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15452,7 +15462,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6434731</v>
+                                    <v>6434723</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15473,7 +15483,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>890165</v>
+                                    <v>890164</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15488,7 +15498,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>12</b>
-                                    <v>116518</v>
+                                    <v>116517</v>
                                 </b>
                                 <b>
                                     <a>12</a>
@@ -15509,7 +15519,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>909406</v>
+                                    <v>909405</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15545,12 +15555,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1159933</v>
+                                    <v>1159932</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>207741</v>
+                                    <v>207740</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -15576,12 +15586,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1026327</v>
+                                    <v>1026326</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>228596</v>
+                                    <v>228595</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -15612,7 +15622,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>457999</v>
+                                    <v>457998</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15627,7 +15637,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>65390</v>
+                                    <v>65389</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -15658,7 +15668,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>156344</v>
+                                    <v>156343</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -15694,7 +15704,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>640176</v>
+                                    <v>640175</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15725,7 +15735,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>487734</v>
+                                    <v>487733</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15761,7 +15771,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3120828</v>
+                                    <v>3120824</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15787,7 +15797,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3145719</v>
+                                    <v>3145715</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15813,7 +15823,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3312961</v>
+                                    <v>3312957</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15839,7 +15849,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3594435</v>
+                                    <v>3594430</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15854,11 +15864,11 @@
         </relation>
         <relation>
             <name>var_def</name>
-            <cardinality>3747415</cardinality>
+            <cardinality>3747410</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3747415</v>
+                    <v>3747410</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -16008,19 +16018,19 @@
         </relation>
         <relation>
             <name>type_decls</name>
-            <cardinality>1890757</cardinality>
+            <cardinality>1890777</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1890757</v>
+                    <v>1890777</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1849357</v>
+                    <v>1849364</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>1485512</v>
+                    <v>1485517</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16034,7 +16044,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1890757</v>
+                                    <v>1890777</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16050,7 +16060,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1890757</v>
+                                    <v>1890777</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16066,12 +16076,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1819567</v>
+                                    <v>1819574</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>24</b>
-                                    <v>29789</v>
+                                    <v>29790</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16087,7 +16097,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1820895</v>
+                                    <v>1820902</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -16108,7 +16118,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1408984</v>
+                                    <v>1408989</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -16129,12 +16139,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1410326</v>
+                                    <v>1410331</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>651</b>
-                                    <v>75185</v>
+                                    <v>75186</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16144,22 +16154,22 @@
         </relation>
         <relation>
             <name>type_def</name>
-            <cardinality>1297357</cardinality>
+            <cardinality>1297362</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1297357</v>
+                    <v>1297362</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>type_decl_top</name>
-            <cardinality>652212</cardinality>
+            <cardinality>652211</cardinality>
             <columnsizes>
                 <e>
                     <k>type_decl</k>
-                    <v>652212</v>
+                    <v>652211</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -16239,11 +16249,11 @@
         </relation>
         <relation>
             <name>namespace_decls</name>
-            <cardinality>425651</cardinality>
+            <cardinality>425650</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>425651</v>
+                    <v>425650</v>
                 </e>
                 <e>
                     <k>namespace_id</k>
@@ -16251,11 +16261,11 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>425651</v>
+                    <v>425650</v>
                 </e>
                 <e>
                     <k>bodylocation</k>
-                    <v>425651</v>
+                    <v>425650</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16269,7 +16279,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>425651</v>
+                                    <v>425650</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16285,7 +16295,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>425651</v>
+                                    <v>425650</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16301,7 +16311,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>425651</v>
+                                    <v>425650</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16515,7 +16525,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>425651</v>
+                                    <v>425650</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16531,7 +16541,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>425651</v>
+                                    <v>425650</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16547,7 +16557,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>425651</v>
+                                    <v>425650</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16563,7 +16573,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>425651</v>
+                                    <v>425650</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16579,7 +16589,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>425651</v>
+                                    <v>425650</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16595,7 +16605,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>425651</v>
+                                    <v>425650</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16605,11 +16615,11 @@
         </relation>
         <relation>
             <name>usings</name>
-            <cardinality>338567</cardinality>
+            <cardinality>338568</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>338567</v>
+                    <v>338568</v>
                 </e>
                 <e>
                     <k>element_id</k>
@@ -16635,7 +16645,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>338567</v>
+                                    <v>338568</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16651,7 +16661,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>338567</v>
+                                    <v>338568</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16667,7 +16677,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>338567</v>
+                                    <v>338568</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16683,7 +16693,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>55420</v>
+                                    <v>55421</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -16709,7 +16719,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>55420</v>
+                                    <v>55421</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -16886,7 +16896,7 @@
         </relation>
         <relation>
             <name>using_container</name>
-            <cardinality>732094</cardinality>
+            <cardinality>732097</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
@@ -16894,7 +16904,7 @@
                 </e>
                 <e>
                     <k>child</k>
-                    <v>338567</v>
+                    <v>338568</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16964,7 +16974,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>154259</v>
+                                    <v>154260</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -17597,15 +17607,15 @@
         </relation>
         <relation>
             <name>params</name>
-            <cardinality>4808499</cardinality>
+            <cardinality>4808534</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4798833</v>
+                    <v>4798867</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>2659144</v>
+                    <v>2659163</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -17613,7 +17623,7 @@
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>862079</v>
+                    <v>862085</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -17627,7 +17637,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4798833</v>
+                                    <v>4798867</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17643,7 +17653,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4798833</v>
+                                    <v>4798867</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17659,7 +17669,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4789510</v>
+                                    <v>4789545</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -17680,22 +17690,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1392103</v>
+                                    <v>1392113</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>661145</v>
+                                    <v>661149</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>439589</v>
+                                    <v>439592</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>21</b>
-                                    <v>166306</v>
+                                    <v>166307</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17711,22 +17721,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1392103</v>
+                                    <v>1392113</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>661145</v>
+                                    <v>661149</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>439589</v>
+                                    <v>439592</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>21</b>
-                                    <v>166306</v>
+                                    <v>166307</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17742,17 +17752,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1481035</v>
+                                    <v>1481046</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>669909</v>
+                                    <v>669914</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>403844</v>
+                                    <v>403847</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -18016,12 +18026,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>449169</v>
+                                    <v>449172</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>180011</v>
+                                    <v>180012</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -18031,7 +18041,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>77761</v>
+                                    <v>77762</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -18041,7 +18051,7 @@
                                 <b>
                                     <a>15</a>
                                     <b>3702</b>
-                                    <v>36388</v>
+                                    <v>36389</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18057,12 +18067,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>492088</v>
+                                    <v>492092</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>152343</v>
+                                    <v>152345</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -18072,12 +18082,12 @@
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>69383</v>
+                                    <v>69384</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>18</b>
-                                    <v>66247</v>
+                                    <v>66248</v>
                                 </b>
                                 <b>
                                     <a>18</a>
@@ -18098,17 +18108,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>634465</v>
+                                    <v>634470</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>187744</v>
+                                    <v>187746</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>17</b>
-                                    <v>39868</v>
+                                    <v>39869</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18196,11 +18206,11 @@
         </relation>
         <relation>
             <name>membervariables</name>
-            <cardinality>1444238</cardinality>
+            <cardinality>1444236</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1441780</v>
+                    <v>1441778</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -18208,7 +18218,7 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>617367</v>
+                    <v>617366</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18222,7 +18232,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1439432</v>
+                                    <v>1439430</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18243,7 +18253,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1441780</v>
+                                    <v>1441778</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18290,7 +18300,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>348935</v>
+                                    <v>348934</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18326,12 +18336,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>118296</v>
+                                    <v>118295</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>56308</v>
+                                    <v>56307</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -18352,7 +18362,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>502840</v>
+                                    <v>502839</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18372,15 +18382,15 @@
         </relation>
         <relation>
             <name>globalvariables</name>
-            <cardinality>425557</cardinality>
+            <cardinality>425556</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>425546</v>
+                    <v>425545</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1634</v>
+                    <v>1633</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -18398,7 +18408,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>425535</v>
+                                    <v>425534</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18419,7 +18429,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>425546</v>
+                                    <v>425545</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18435,7 +18445,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1147</v>
+                                    <v>1146</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18471,7 +18481,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1179</v>
+                                    <v>1178</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18507,12 +18517,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>399362</v>
+                                    <v>399363</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1044</b>
-                                    <v>5652</v>
+                                    <v>5651</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18528,12 +18538,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>404349</v>
+                                    <v>404350</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>15</b>
-                                    <v>665</v>
+                                    <v>664</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18606,7 +18616,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7925</v>
+                                    <v>7926</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -18647,7 +18657,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>38830</v>
+                                    <v>38831</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18678,7 +18688,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>63261</v>
+                                    <v>63262</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18812,11 +18822,11 @@
         </relation>
         <relation>
             <name>orphaned_variables</name>
-            <cardinality>55893</cardinality>
+            <cardinality>55894</cardinality>
             <columnsizes>
                 <e>
                     <k>var</k>
-                    <v>55893</v>
+                    <v>55894</v>
                 </e>
                 <e>
                     <k>function</k>
@@ -18834,7 +18844,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>55893</v>
+                                    <v>55894</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19578,7 +19588,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>329601</v>
+                                    <v>329600</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19599,7 +19609,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>329601</v>
+                                    <v>329600</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19652,7 +19662,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>329601</v>
+                                    <v>329600</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20439,15 +20449,15 @@
         </relation>
         <relation>
             <name>derivedtypes</name>
-            <cardinality>3188505</cardinality>
+            <cardinality>3188501</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3188505</v>
+                    <v>3188501</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1506662</v>
+                    <v>1506660</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -20455,7 +20465,7 @@
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>2055212</v>
+                    <v>2055209</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20469,7 +20479,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3188505</v>
+                                    <v>3188501</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20485,7 +20495,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3188505</v>
+                                    <v>3188501</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20501,7 +20511,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3188505</v>
+                                    <v>3188501</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20517,12 +20527,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1369020</v>
+                                    <v>1369018</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>113827</v>
+                                    <v>113826</v>
                                 </b>
                                 <b>
                                     <a>10</a>
@@ -20543,7 +20553,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1506662</v>
+                                    <v>1506660</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20559,7 +20569,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1369154</v>
+                                    <v>1369153</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20708,7 +20718,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1388260</v>
+                                    <v>1388258</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20739,7 +20749,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1389875</v>
+                                    <v>1389873</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20770,7 +20780,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1390144</v>
+                                    <v>1390142</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20795,11 +20805,11 @@
         </relation>
         <relation>
             <name>pointerishsize</name>
-            <cardinality>2366958</cardinality>
+            <cardinality>2366955</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2366958</v>
+                    <v>2366955</v>
                 </e>
                 <e>
                     <k>size</k>
@@ -20821,7 +20831,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2366958</v>
+                                    <v>2366955</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20837,7 +20847,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2366958</v>
+                                    <v>2366955</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21317,15 +21327,15 @@
         </relation>
         <relation>
             <name>typedefbase</name>
-            <cardinality>2175691</cardinality>
+            <cardinality>2175706</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2175691</v>
+                    <v>2175706</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>905385</v>
+                    <v>905391</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21339,7 +21349,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2175691</v>
+                                    <v>2175706</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21355,7 +21365,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>730529</v>
+                                    <v>730534</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21380,19 +21390,19 @@
         </relation>
         <relation>
             <name>decltypes</name>
-            <cardinality>175625</cardinality>
+            <cardinality>175649</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>15417</v>
+                    <v>15374</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>161560</v>
+                    <v>161629</v>
                 </e>
                 <e>
                     <k>base_type</k>
-                    <v>11309</v>
+                    <v>11280</v>
                 </e>
                 <e>
                     <k>parentheses_would_change_meaning</k>
@@ -21410,27 +21420,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2185</v>
+                                    <v>2137</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6656</v>
+                                    <v>6659</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2161</v>
+                                    <v>2162</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1055</v>
+                                    <v>1056</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>9</b>
-                                    <v>1212</v>
+                                    <v>1213</v>
                                 </b>
                                 <b>
                                     <a>9</a>
@@ -21456,7 +21466,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15417</v>
+                                    <v>15374</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21472,7 +21482,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15417</v>
+                                    <v>15374</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21488,16 +21498,16 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>148024</v>
+                                    <v>148087</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>13057</v>
+                                    <v>13063</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>5</b>
+                                    <b>4</b>
                                     <v>478</v>
                                 </b>
                             </bs>
@@ -21514,16 +21524,16 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>148024</v>
+                                    <v>148087</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>13057</v>
+                                    <v>13063</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>5</b>
+                                    <b>4</b>
                                     <v>478</v>
                                 </b>
                             </bs>
@@ -21540,7 +21550,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>161560</v>
+                                    <v>161629</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21556,12 +21566,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9799</v>
+                                    <v>9787</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1336</v>
+                                    <v>1320</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -21582,12 +21592,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>981</v>
+                                    <v>965</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5518</v>
+                                    <v>5504</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -21597,17 +21607,17 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1113</v>
+                                    <v>1114</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>948</v>
+                                    <v>949</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>41</b>
-                                    <v>857</v>
+                                    <v>858</v>
                                 </b>
                                 <b>
                                     <a>42</a>
@@ -21628,7 +21638,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11309</v>
+                                    <v>11280</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21647,8 +21657,8 @@
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>1867</a>
-                                    <b>1868</b>
+                                    <a>1861</a>
+                                    <b>1862</b>
                                     <v>8</v>
                                 </b>
                             </bs>
@@ -21689,8 +21699,8 @@
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>1369</a>
-                                    <b>1370</b>
+                                    <a>1365</a>
+                                    <b>1366</b>
                                     <v>8</v>
                                 </b>
                             </bs>
@@ -21701,15 +21711,15 @@
         </relation>
         <relation>
             <name>usertypes</name>
-            <cardinality>4992117</cardinality>
+            <cardinality>4987434</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4992117</v>
+                    <v>4987434</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1074915</v>
+                    <v>1074810</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -21727,7 +21737,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4992117</v>
+                                    <v>4987434</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21743,7 +21753,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4992117</v>
+                                    <v>4987434</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21759,22 +21769,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>742932</v>
+                                    <v>743259</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>197244</v>
+                                    <v>196974</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>86104</v>
+                                    <v>85996</v>
                                 </b>
                                 <b>
                                     <a>7</a>
-                                    <b>29574</b>
-                                    <v>48633</v>
+                                    <b>30181</b>
+                                    <v>48579</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21790,12 +21800,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1007695</v>
+                                    <v>1008457</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>67220</v>
+                                    <v>66353</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21839,8 +21849,8 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>4522</a>
-                                    <b>4523</b>
+                                    <a>4581</a>
+                                    <b>4582</b>
                                     <v>13</v>
                                 </b>
                                 <b>
@@ -21849,23 +21859,23 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>20080</a>
-                                    <b>20081</b>
+                                    <a>20064</a>
+                                    <b>20065</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>82457</a>
-                                    <b>82458</b>
+                                    <a>82095</a>
+                                    <b>82096</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>85575</a>
-                                    <b>85576</b>
+                                    <a>85548</a>
+                                    <b>85549</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>151140</a>
-                                    <b>151141</b>
+                                    <a>151139</a>
+                                    <b>151140</b>
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -21905,8 +21915,8 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>832</a>
-                                    <b>833</b>
+                                    <a>771</a>
+                                    <b>772</b>
                                     <v>13</v>
                                 </b>
                                 <b>
@@ -21915,8 +21925,8 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>3087</a>
-                                    <b>3088</b>
+                                    <a>3066</a>
+                                    <b>3067</b>
                                     <v>13</v>
                                 </b>
                                 <b>
@@ -21925,8 +21935,8 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>10837</a>
-                                    <b>10838</b>
+                                    <a>10829</a>
+                                    <b>10830</b>
                                     <v>13</v>
                                 </b>
                                 <b>
@@ -21935,8 +21945,8 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>51364</a>
-                                    <b>51365</b>
+                                    <a>51345</a>
+                                    <b>51346</b>
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -21947,11 +21957,11 @@
         </relation>
         <relation>
             <name>usertypesize</name>
-            <cardinality>1631914</cardinality>
+            <cardinality>1632137</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1631914</v>
+                    <v>1632137</v>
                 </e>
                 <e>
                     <k>size</k>
@@ -21973,7 +21983,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1631914</v>
+                                    <v>1632137</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21989,7 +21999,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1631914</v>
+                                    <v>1632137</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22049,7 +22059,7 @@
                                 </b>
                                 <b>
                                     <a>1733</a>
-                                    <b>92713</b>
+                                    <b>92729</b>
                                     <v>67</v>
                                 </b>
                             </bs>
@@ -22125,8 +22135,8 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>107899</a>
-                                    <b>107900</b>
+                                    <a>107915</a>
+                                    <b>107916</b>
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -22247,11 +22257,11 @@
         </relation>
         <relation>
             <name>usertype_alias_kind</name>
-            <cardinality>2175733</cardinality>
+            <cardinality>2175749</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2175691</v>
+                    <v>2175706</v>
                 </e>
                 <e>
                     <k>alias_kind</k>
@@ -22269,7 +22279,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2175648</v>
+                                    <v>2175663</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22305,11 +22315,11 @@
         </relation>
         <relation>
             <name>nontype_template_parameters</name>
-            <cardinality>966305</cardinality>
+            <cardinality>966312</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>966305</v>
+                    <v>966312</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -22389,15 +22399,15 @@
         </relation>
         <relation>
             <name>mangled_name</name>
-            <cardinality>7780866</cardinality>
+            <cardinality>7776179</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7780866</v>
+                    <v>7776179</v>
                 </e>
                 <e>
                     <k>mangled_name</k>
-                    <v>5325726</v>
+                    <v>5325040</v>
                 </e>
                 <e>
                     <k>is_complete</k>
@@ -22415,7 +22425,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7780866</v>
+                                    <v>7776179</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22431,7 +22441,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7780866</v>
+                                    <v>7776179</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22447,17 +22457,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4731594</v>
+                                    <v>4731503</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>459569</v>
+                                    <v>459353</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>8985</b>
-                                    <v>134562</v>
+                                    <b>9032</b>
+                                    <v>134183</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22473,7 +22483,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5325726</v>
+                                    <v>5325040</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22492,8 +22502,8 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>570981</a>
-                                    <b>570982</b>
+                                    <a>570633</a>
+                                    <b>570634</b>
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -22513,8 +22523,8 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>391611</a>
-                                    <b>391612</b>
+                                    <a>391559</a>
+                                    <b>391560</b>
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -22525,59 +22535,59 @@
         </relation>
         <relation>
             <name>is_pod_class</name>
-            <cardinality>747542</cardinality>
+            <cardinality>747547</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>747542</v>
+                    <v>747547</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_standard_layout_class</name>
-            <cardinality>1344636</cardinality>
+            <cardinality>1344858</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1344636</v>
+                    <v>1344858</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_complete</name>
-            <cardinality>1611052</cardinality>
+            <cardinality>1611274</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1611052</v>
+                    <v>1611274</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_class_template</name>
-            <cardinality>292182</cardinality>
+            <cardinality>292183</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>292182</v>
+                    <v>292183</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>class_instantiation</name>
-            <cardinality>1327526</cardinality>
+            <cardinality>1327030</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>1323611</v>
+                    <v>1323128</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>91713</v>
+                    <v>91605</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22591,12 +22601,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1320861</v>
+                                    <v>1320392</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>2750</v>
+                                    <v>2736</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22612,42 +22622,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26741</v>
+                                    <v>26728</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>16676</v>
+                                    <v>16622</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>9130</v>
+                                    <v>9103</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>5987</v>
+                                    <v>5974</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>7667</v>
+                                    <v>7694</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>10</b>
-                                    <v>6922</v>
+                                    <v>6949</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>17</b>
-                                    <v>7423</v>
+                                    <v>7356</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>53</b>
-                                    <v>6922</v>
+                                    <v>6936</v>
                                 </b>
                                 <b>
                                     <a>53</a>
@@ -22662,11 +22672,11 @@
         </relation>
         <relation>
             <name>class_template_argument</name>
-            <cardinality>3502880</cardinality>
+            <cardinality>3501700</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>1631792</v>
+                    <v>1631215</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -22674,7 +22684,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>1034653</v>
+                    <v>1034467</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22688,27 +22698,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>679139</v>
+                                    <v>678884</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>490293</v>
+                                    <v>490105</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>308844</v>
+                                    <v>308751</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>124144</v>
+                                    <v>124118</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>113</b>
-                                    <v>29369</v>
+                                    <v>29356</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22724,22 +22734,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>713697</v>
+                                    <v>713442</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>505642</v>
+                                    <v>505454</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>306907</v>
+                                    <v>306813</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>113</b>
-                                    <v>105544</v>
+                                    <v>105504</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22779,12 +22789,12 @@
                                 </b>
                                 <b>
                                     <a>643</a>
-                                    <b>6821</b>
+                                    <b>6819</b>
                                     <v>121</v>
                                 </b>
                                 <b>
-                                    <a>11332</a>
-                                    <b>120452</b>
+                                    <a>11329</a>
+                                    <b>120409</b>
                                     <v>54</v>
                                 </b>
                             </bs>
@@ -22829,8 +22839,8 @@
                                     <v>121</v>
                                 </b>
                                 <b>
-                                    <a>10038</a>
-                                    <b>43717</b>
+                                    <a>10035</a>
+                                    <b>43710</b>
                                     <v>40</v>
                                 </b>
                             </bs>
@@ -22847,26 +22857,26 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>648834</v>
+                                    <v>649080</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>212417</v>
+                                    <v>212187</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>62194</v>
+                                    <v>62153</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>11</b>
-                                    <v>78830</v>
+                                    <v>78667</v>
                                 </b>
                                 <b>
                                     <a>11</a>
-                                    <b>11558</b>
+                                    <b>11553</b>
                                     <v>32377</v>
                                 </b>
                             </bs>
@@ -22883,12 +22893,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>912540</v>
+                                    <v>912381</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>98879</v>
+                                    <v>98852</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -22903,11 +22913,11 @@
         </relation>
         <relation>
             <name>class_template_argument_value</name>
-            <cardinality>643229</cardinality>
+            <cardinality>643234</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>259534</v>
+                    <v>259536</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -22915,7 +22925,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>643057</v>
+                    <v>643062</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22929,12 +22939,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>196466</v>
+                                    <v>196467</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>54690</v>
+                                    <v>54691</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -22955,7 +22965,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>186541</v>
+                                    <v>186543</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23098,7 +23108,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>642886</v>
+                                    <v>642890</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23119,7 +23129,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>643057</v>
+                                    <v>643062</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23129,15 +23139,15 @@
         </relation>
         <relation>
             <name>is_proxy_class_for</name>
-            <cardinality>61259</cardinality>
+            <cardinality>62059</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>61259</v>
+                    <v>62059</v>
                 </e>
                 <e>
                     <k>templ_param_id</k>
-                    <v>60135</v>
+                    <v>58631</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23151,7 +23161,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>61259</v>
+                                    <v>62059</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23167,12 +23177,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>59620</v>
+                                    <v>57710</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>21</b>
-                                    <v>514</v>
+                                    <b>79</b>
+                                    <v>921</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23182,11 +23192,11 @@
         </relation>
         <relation>
             <name>type_mentions</name>
-            <cardinality>5507865</cardinality>
+            <cardinality>5507858</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5507865</v>
+                    <v>5507858</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -23194,7 +23204,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5462043</v>
+                    <v>5462036</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -23212,7 +23222,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5507865</v>
+                                    <v>5507858</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23228,7 +23238,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5507865</v>
+                                    <v>5507858</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23244,7 +23254,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5507865</v>
+                                    <v>5507858</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23295,7 +23305,7 @@
                                 <b>
                                     <a>27</a>
                                     <b>8555</b>
-                                    <v>19716</v>
+                                    <v>19715</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23346,7 +23356,7 @@
                                 <b>
                                     <a>27</a>
                                     <b>8555</b>
-                                    <v>19716</v>
+                                    <v>19715</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23378,7 +23388,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5416221</v>
+                                    <v>5416214</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23399,7 +23409,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5416221</v>
+                                    <v>5416214</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23420,7 +23430,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5462043</v>
+                                    <v>5462036</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23478,26 +23488,26 @@
         </relation>
         <relation>
             <name>is_function_template</name>
-            <cardinality>1418399</cardinality>
+            <cardinality>1418397</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1418399</v>
+                    <v>1418397</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_instantiation</name>
-            <cardinality>1226957</cardinality>
+            <cardinality>1226965</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>1226957</v>
+                    <v>1226965</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>230191</v>
+                    <v>230193</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23511,7 +23521,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1226957</v>
+                                    <v>1226965</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23527,7 +23537,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>140013</v>
+                                    <v>140014</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23557,11 +23567,11 @@
         </relation>
         <relation>
             <name>function_template_argument</name>
-            <cardinality>3133404</cardinality>
+            <cardinality>3133426</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
-                    <v>1832637</v>
+                    <v>1832651</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -23569,7 +23579,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>375790</v>
+                    <v>375792</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23583,22 +23593,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>987399</v>
+                                    <v>987407</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>521002</v>
+                                    <v>521006</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>216658</v>
+                                    <v>216659</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>15</b>
-                                    <v>107577</v>
+                                    <v>107578</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23614,17 +23624,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1011544</v>
+                                    <v>1011551</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>518596</v>
+                                    <v>518600</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>213908</v>
+                                    <v>213910</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -23767,12 +23777,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>220396</v>
+                                    <v>220397</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>33209</v>
+                                    <v>33210</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -23782,7 +23792,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>28569</v>
+                                    <v>28570</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -23813,7 +23823,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>323848</v>
+                                    <v>323851</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23823,7 +23833,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>15</b>
-                                    <v>11427</v>
+                                    <v>11428</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23833,11 +23843,11 @@
         </relation>
         <relation>
             <name>function_template_argument_value</name>
-            <cardinality>570967</cardinality>
+            <cardinality>570971</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
-                    <v>248149</v>
+                    <v>248151</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -23845,7 +23855,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>567573</v>
+                    <v>567577</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23859,7 +23869,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>190923</v>
+                                    <v>190925</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23885,7 +23895,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>182202</v>
+                                    <v>182203</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24038,7 +24048,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>564179</v>
+                                    <v>564183</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24059,7 +24069,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>567573</v>
+                                    <v>567577</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24163,11 +24173,11 @@
         </relation>
         <relation>
             <name>variable_template_argument</name>
-            <cardinality>525811</cardinality>
+            <cardinality>525810</cardinality>
             <columnsizes>
                 <e>
                     <k>variable_id</k>
-                    <v>267211</v>
+                    <v>267210</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -24175,7 +24185,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>257120</v>
+                    <v>257119</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24220,12 +24230,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>122169</v>
+                                    <v>122168</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>99296</v>
+                                    <v>99295</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -25274,7 +25284,7 @@
             <columnsizes>
                 <e>
                     <k>concept_id</k>
-                    <v>81869</v>
+                    <v>81870</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -25296,12 +25306,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>49813</v>
+                                    <v>49814</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>26451</v>
+                                    <v>26452</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -25543,7 +25553,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>65</v>
+                                    <v>66</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25632,15 +25642,15 @@
         </relation>
         <relation>
             <name>routinetypes</name>
-            <cardinality>762063</cardinality>
+            <cardinality>762068</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>762063</v>
+                    <v>762068</v>
                 </e>
                 <e>
                     <k>return_type</k>
-                    <v>357960</v>
+                    <v>357963</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25654,7 +25664,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>762063</v>
+                                    <v>762068</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25670,7 +25680,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>295365</v>
+                                    <v>295367</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25690,7 +25700,7 @@
         </relation>
         <relation>
             <name>routinetypeargs</name>
-            <cardinality>1165647</cardinality>
+            <cardinality>1165645</cardinality>
             <columnsizes>
                 <e>
                     <k>routine</k>
@@ -25731,7 +25741,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>48935</v>
+                                    <v>48934</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -25772,7 +25782,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>40142</v>
+                                    <v>40141</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -26000,12 +26010,12 @@
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>9503</v>
+                                    <v>9502</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>13</b>
-                                    <v>9503</v>
+                                    <v>9502</v>
                                 </b>
                                 <b>
                                     <a>13</a>
@@ -26031,7 +26041,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>78154</v>
+                                    <v>78153</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26041,7 +26051,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>9503</v>
+                                    <v>9502</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -26212,15 +26222,15 @@
         </relation>
         <relation>
             <name>specifiers</name>
-            <cardinality>7131</cardinality>
+            <cardinality>8341</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7131</v>
+                    <v>8341</v>
                 </e>
                 <e>
                     <k>str</k>
-                    <v>7131</v>
+                    <v>8341</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26234,7 +26244,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7131</v>
+                                    <v>8341</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26250,7 +26260,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7131</v>
+                                    <v>8341</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26260,11 +26270,11 @@
         </relation>
         <relation>
             <name>typespecifiers</name>
-            <cardinality>988078</cardinality>
+            <cardinality>991496</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>981495</v>
+                    <v>984912</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -26282,7 +26292,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>974911</v>
+                                    <v>978328</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26331,8 +26341,8 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>17156</a>
-                                    <b>17157</b>
+                                    <a>17408</a>
+                                    <b>17409</b>
                                     <v>13</v>
                                 </b>
                                 <b>
@@ -26348,15 +26358,15 @@
         </relation>
         <relation>
             <name>funspecifiers</name>
-            <cardinality>9758473</cardinality>
+            <cardinality>9728427</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>3343789</v>
+                    <v>3340505</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>859</v>
+                    <v>816</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26370,32 +26380,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>431941</v>
+                                    <v>437873</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>686449</v>
+                                    <v>677260</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1416678</v>
+                                    <v>1424206</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>458148</v>
+                                    <v>459483</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>233886</v>
+                                    <v>225080</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>116685</v>
+                                    <v>116600</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26438,11 +26448,6 @@
                                     <b>563</b>
                                     <v>42</v>
                                 </b>
-                                <b>
-                                    <a>704</a>
-                                    <b>705</b>
-                                    <v>42</v>
-                                </b>
                                 <b>
                                     <a>1589</a>
                                     <b>1590</b>
@@ -26489,8 +26494,8 @@
                                     <v>42</v>
                                 </b>
                                 <b>
-                                    <a>42404</a>
-                                    <b>42405</b>
+                                    <a>42407</a>
+                                    <b>42408</b>
                                     <v>42</v>
                                 </b>
                                 <b>
@@ -26511,11 +26516,11 @@
         </relation>
         <relation>
             <name>varspecifiers</name>
-            <cardinality>2898034</cardinality>
+            <cardinality>2898030</cardinality>
             <columnsizes>
                 <e>
                     <k>var_id</k>
-                    <v>2545003</v>
+                    <v>2544999</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -26533,12 +26538,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2191971</v>
+                                    <v>2191969</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>353031</v>
+                                    <v>353030</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26642,11 +26647,11 @@
         </relation>
         <relation>
             <name>attributes</name>
-            <cardinality>629816</cardinality>
+            <cardinality>629815</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>629816</v>
+                    <v>629815</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -26662,7 +26667,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>623358</v>
+                    <v>623357</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26676,7 +26681,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>629816</v>
+                                    <v>629815</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26692,7 +26697,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>629816</v>
+                                    <v>629815</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26708,7 +26713,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>629816</v>
+                                    <v>629815</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26724,7 +26729,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>629816</v>
+                                    <v>629815</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27112,7 +27117,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>617034</v>
+                                    <v>617033</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27133,7 +27138,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>623358</v>
+                                    <v>623357</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27170,7 +27175,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>623358</v>
+                                    <v>623357</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27428,7 +27433,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2302</v>
+                                    <v>2303</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27444,7 +27449,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>79046</v>
+                                    <v>79047</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27465,7 +27470,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>80658</v>
+                                    <v>80659</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27641,7 +27646,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>91726</v>
+                                    <v>91727</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27854,15 +27859,15 @@
         </relation>
         <relation>
             <name>attribute_arg_constant</name>
-            <cardinality>89599</cardinality>
+            <cardinality>89600</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>89599</v>
+                    <v>89600</v>
                 </e>
                 <e>
                     <k>constant</k>
-                    <v>89599</v>
+                    <v>89600</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27876,7 +27881,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>89599</v>
+                                    <v>89600</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27892,7 +27897,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>89599</v>
+                                    <v>89600</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28071,15 +28076,15 @@
         </relation>
         <relation>
             <name>funcattributes</name>
-            <cardinality>824910</cardinality>
+            <cardinality>824909</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>776473</v>
+                    <v>776472</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>598601</v>
+                    <v>598600</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28114,7 +28119,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>555008</v>
+                                    <v>555007</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28260,15 +28265,15 @@
         </relation>
         <relation>
             <name>unspecifiedtype</name>
-            <cardinality>8350274</cardinality>
+            <cardinality>8345603</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>8350274</v>
+                    <v>8345603</v>
                 </e>
                 <e>
                     <k>unspecified_type_id</k>
-                    <v>4803705</v>
+                    <v>4799035</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28282,7 +28287,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8350274</v>
+                                    <v>8345603</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28298,17 +28303,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3203138</v>
+                                    <v>3198462</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1309007</v>
+                                    <v>1309012</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6271</b>
-                                    <v>291558</v>
+                                    <v>291559</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28318,11 +28323,11 @@
         </relation>
         <relation>
             <name>member</name>
-            <cardinality>4687174</cardinality>
+            <cardinality>4687208</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>562417</v>
+                    <v>562422</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -28330,7 +28335,7 @@
                 </e>
                 <e>
                     <k>child</k>
-                    <v>4569973</v>
+                    <v>4570006</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28344,7 +28349,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>233198</v>
+                                    <v>233200</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28359,17 +28364,17 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>37763</v>
+                                    <v>37764</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>47859</v>
+                                    <v>47860</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>11</b>
-                                    <v>43348</v>
+                                    <v>43349</v>
                                 </b>
                                 <b>
                                     <a>11</a>
@@ -28384,7 +28389,7 @@
                                 <b>
                                     <a>19</a>
                                     <b>53</b>
-                                    <v>42317</v>
+                                    <v>42318</v>
                                 </b>
                                 <b>
                                     <a>53</a>
@@ -28405,7 +28410,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>233069</v>
+                                    <v>233071</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28445,7 +28450,7 @@
                                 <b>
                                     <a>19</a>
                                     <b>53</b>
-                                    <v>42317</v>
+                                    <v>42318</v>
                                 </b>
                                 <b>
                                     <a>53</a>
@@ -28603,7 +28608,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4569973</v>
+                                    <v>4570006</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28619,12 +28624,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4482115</v>
+                                    <v>4482148</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>13</b>
-                                    <v>87857</v>
+                                    <v>87858</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28634,15 +28639,15 @@
         </relation>
         <relation>
             <name>enclosingfunction</name>
-            <cardinality>144782</cardinality>
+            <cardinality>144783</cardinality>
             <columnsizes>
                 <e>
                     <k>child</k>
-                    <v>144782</v>
+                    <v>144783</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>89962</v>
+                    <v>89963</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28656,7 +28661,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>144782</v>
+                                    <v>144783</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28682,7 +28687,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>19375</v>
+                                    <v>19376</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -28697,15 +28702,15 @@
         </relation>
         <relation>
             <name>derivations</name>
-            <cardinality>599880</cardinality>
+            <cardinality>599885</cardinality>
             <columnsizes>
                 <e>
                     <k>derivation</k>
-                    <v>599880</v>
+                    <v>599885</v>
                 </e>
                 <e>
                     <k>sub</k>
-                    <v>572471</v>
+                    <v>572475</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -28713,11 +28718,11 @@
                 </e>
                 <e>
                     <k>super</k>
-                    <v>296052</v>
+                    <v>296054</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>44637</v>
+                    <v>44638</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28731,7 +28736,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>599880</v>
+                                    <v>599885</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28747,7 +28752,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>599880</v>
+                                    <v>599885</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28763,7 +28768,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>599880</v>
+                                    <v>599885</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28779,7 +28784,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>599880</v>
+                                    <v>599885</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28795,7 +28800,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>551634</v>
+                                    <v>551638</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28816,7 +28821,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>551634</v>
+                                    <v>551638</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28837,7 +28842,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>551634</v>
+                                    <v>551638</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28858,7 +28863,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>551634</v>
+                                    <v>551638</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29018,7 +29023,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>283937</v>
+                                    <v>283939</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29039,7 +29044,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>283937</v>
+                                    <v>283939</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29060,7 +29065,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>295493</v>
+                                    <v>295496</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29081,7 +29086,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>289522</v>
+                                    <v>289524</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29174,7 +29179,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>44637</v>
+                                    <v>44638</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29215,11 +29220,11 @@
         </relation>
         <relation>
             <name>derspecifiers</name>
-            <cardinality>602115</cardinality>
+            <cardinality>602119</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>599322</v>
+                    <v>599326</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -29237,7 +29242,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>596529</v>
+                                    <v>596534</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29283,11 +29288,11 @@
         </relation>
         <relation>
             <name>direct_base_offsets</name>
-            <cardinality>565940</cardinality>
+            <cardinality>565944</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>565940</v>
+                    <v>565944</v>
                 </e>
                 <e>
                     <k>offset</k>
@@ -29305,7 +29310,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>565940</v>
+                                    <v>565944</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29502,19 +29507,19 @@
         </relation>
         <relation>
             <name>frienddecls</name>
-            <cardinality>883302</cardinality>
+            <cardinality>883308</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>883302</v>
+                    <v>883308</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>53487</v>
+                    <v>53488</v>
                 </e>
                 <e>
                     <k>decl_id</k>
-                    <v>98039</v>
+                    <v>98169</v>
                 </e>
                 <e>
                     <k>location</k>
@@ -29532,7 +29537,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>883302</v>
+                                    <v>883308</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29548,7 +29553,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>883302</v>
+                                    <v>883308</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29564,7 +29569,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>883302</v>
+                                    <v>883308</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29713,12 +29718,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>60361</v>
+                                    <v>60620</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7647</v>
+                                    <v>7518</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -29754,12 +29759,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>60361</v>
+                                    <v>60620</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7647</v>
+                                    <v>7518</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -29795,7 +29800,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>97180</v>
+                                    <v>97310</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29862,7 +29867,7 @@
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>2129</b>
+                                    <b>2132</b>
                                     <v>429</v>
                                 </b>
                             </bs>
@@ -29873,19 +29878,19 @@
         </relation>
         <relation>
             <name>comments</name>
-            <cardinality>11290145</cardinality>
+            <cardinality>11290131</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>11290145</v>
+                    <v>11290131</v>
                 </e>
                 <e>
                     <k>contents</k>
-                    <v>4299060</v>
+                    <v>4299054</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>11290145</v>
+                    <v>11290131</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29899,7 +29904,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11290145</v>
+                                    <v>11290131</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29915,7 +29920,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11290145</v>
+                                    <v>11290131</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29931,7 +29936,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3932687</v>
+                                    <v>3932682</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29957,7 +29962,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3932687</v>
+                                    <v>3932682</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29983,7 +29988,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11290145</v>
+                                    <v>11290131</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29999,7 +30004,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11290145</v>
+                                    <v>11290131</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30009,15 +30014,15 @@
         </relation>
         <relation>
             <name>commentbinding</name>
-            <cardinality>3316594</cardinality>
+            <cardinality>3316590</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3263044</v>
+                    <v>3263040</v>
                 </e>
                 <e>
                     <k>element</k>
-                    <v>3173570</v>
+                    <v>3173566</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30031,7 +30036,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3231291</v>
+                                    <v>3231287</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30052,7 +30057,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3030546</v>
+                                    <v>3030542</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30067,15 +30072,15 @@
         </relation>
         <relation>
             <name>exprconv</name>
-            <cardinality>9603748</cardinality>
+            <cardinality>9603735</cardinality>
             <columnsizes>
                 <e>
                     <k>converted</k>
-                    <v>9603643</v>
+                    <v>9603630</v>
                 </e>
                 <e>
                     <k>conversion</k>
-                    <v>9603748</v>
+                    <v>9603735</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30089,7 +30094,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9603537</v>
+                                    <v>9603525</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30110,7 +30115,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9603748</v>
+                                    <v>9603735</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30120,22 +30125,22 @@
         </relation>
         <relation>
             <name>compgenerated</name>
-            <cardinality>10714603</cardinality>
+            <cardinality>10714334</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>10714603</v>
+                    <v>10714334</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>synthetic_destructor_call</name>
-            <cardinality>1791768</cardinality>
+            <cardinality>1791782</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
-                    <v>1334382</v>
+                    <v>1334392</v>
                 </e>
                 <e>
                     <k>i</k>
@@ -30143,7 +30148,7 @@
                 </e>
                 <e>
                     <k>destructor_call</k>
-                    <v>1791768</v>
+                    <v>1791782</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30157,12 +30162,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>888204</v>
+                                    <v>888211</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>438890</v>
+                                    <v>438893</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -30183,12 +30188,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>888204</v>
+                                    <v>888211</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>438890</v>
+                                    <v>438893</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -30341,7 +30346,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1791768</v>
+                                    <v>1791782</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30357,7 +30362,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1791768</v>
+                                    <v>1791782</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30436,7 +30441,7 @@
         </relation>
         <relation>
             <name>namespacembrs</name>
-            <cardinality>2026146</cardinality>
+            <cardinality>2025652</cardinality>
             <columnsizes>
                 <e>
                     <k>parentid</k>
@@ -30444,7 +30449,7 @@
                 </e>
                 <e>
                     <k>memberid</k>
-                    <v>2026146</v>
+                    <v>2025652</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30488,37 +30493,37 @@
                                 <b>
                                     <a>14</a>
                                     <b>22</b>
-                                    <v>785</v>
+                                    <v>812</v>
                                 </b>
                                 <b>
                                     <a>22</a>
-                                    <b>36</b>
-                                    <v>785</v>
+                                    <b>37</b>
+                                    <v>799</v>
                                 </b>
                                 <b>
-                                    <a>36</a>
-                                    <b>55</b>
-                                    <v>812</v>
+                                    <a>37</a>
+                                    <b>57</b>
+                                    <v>799</v>
                                 </b>
                                 <b>
-                                    <a>56</a>
-                                    <b>115</b>
+                                    <a>57</a>
+                                    <b>118</b>
                                     <v>785</v>
                                 </b>
                                 <b>
-                                    <a>115</a>
-                                    <b>244</b>
-                                    <v>785</v>
+                                    <a>118</a>
+                                    <b>255</b>
+                                    <v>812</v>
                                 </b>
                                 <b>
-                                    <a>252</a>
-                                    <b>673</b>
+                                    <a>256</a>
+                                    <b>828</b>
                                     <v>785</v>
                                 </b>
                                 <b>
-                                    <a>674</a>
-                                    <b>42760</b>
-                                    <v>392</v>
+                                    <a>829</a>
+                                    <b>42759</b>
+                                    <v>338</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30534,7 +30539,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2026146</v>
+                                    <v>2025652</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30544,11 +30549,11 @@
         </relation>
         <relation>
             <name>exprparents</name>
-            <cardinality>19401302</cardinality>
+            <cardinality>19401276</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>19401302</v>
+                    <v>19401276</v>
                 </e>
                 <e>
                     <k>child_index</k>
@@ -30556,7 +30561,7 @@
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>12904791</v>
+                    <v>12904774</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30570,7 +30575,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19401302</v>
+                                    <v>19401276</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30586,7 +30591,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19401302</v>
+                                    <v>19401276</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30704,17 +30709,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7374643</v>
+                                    <v>7374634</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5068855</v>
+                                    <v>5068849</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>712</b>
-                                    <v>461292</v>
+                                    <v>461291</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30730,17 +30735,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7374643</v>
+                                    <v>7374634</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5068855</v>
+                                    <v>5068849</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>712</b>
-                                    <v>461292</v>
+                                    <v>461291</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30750,22 +30755,22 @@
         </relation>
         <relation>
             <name>expr_isload</name>
-            <cardinality>6961485</cardinality>
+            <cardinality>6961476</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>6961485</v>
+                    <v>6961476</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>conversionkinds</name>
-            <cardinality>6048224</cardinality>
+            <cardinality>6048225</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>6048224</v>
+                    <v>6048225</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -30783,7 +30788,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6048224</v>
+                                    <v>6048225</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30827,8 +30832,8 @@
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>5829769</a>
-                                    <b>5829770</b>
+                                    <a>5829770</a>
+                                    <b>5829771</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -30839,11 +30844,11 @@
         </relation>
         <relation>
             <name>iscall</name>
-            <cardinality>6219922</cardinality>
+            <cardinality>6219948</cardinality>
             <columnsizes>
                 <e>
                     <k>caller</k>
-                    <v>6219922</v>
+                    <v>6219948</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -30861,7 +30866,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6219922</v>
+                                    <v>6219948</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30885,8 +30890,8 @@
                                     <v>23</v>
                                 </b>
                                 <b>
-                                    <a>268068</a>
-                                    <b>268069</b>
+                                    <a>268067</a>
+                                    <b>268068</b>
                                     <v>23</v>
                                 </b>
                             </bs>
@@ -30897,11 +30902,11 @@
         </relation>
         <relation>
             <name>numtemplatearguments</name>
-            <cardinality>723397</cardinality>
+            <cardinality>723402</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>723397</v>
+                    <v>723402</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -30919,7 +30924,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>723397</v>
+                                    <v>723402</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31028,15 +31033,15 @@
         </relation>
         <relation>
             <name>namequalifiers</name>
-            <cardinality>3258064</cardinality>
+            <cardinality>3258067</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3258064</v>
+                    <v>3258067</v>
                 </e>
                 <e>
                     <k>qualifiableelement</k>
-                    <v>3258064</v>
+                    <v>3258067</v>
                 </e>
                 <e>
                     <k>qualifyingelement</k>
@@ -31044,7 +31049,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>591859</v>
+                    <v>591864</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -31058,7 +31063,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3258064</v>
+                                    <v>3258067</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31074,7 +31079,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3258064</v>
+                                    <v>3258067</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31090,7 +31095,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3258064</v>
+                                    <v>3258067</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31106,7 +31111,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3258064</v>
+                                    <v>3258067</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31122,7 +31127,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3258064</v>
+                                    <v>3258067</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31138,7 +31143,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3258064</v>
+                                    <v>3258067</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31154,7 +31159,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33831</v>
+                                    <v>33832</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31172,7 +31177,7 @@
                                     <v>3782</v>
                                 </b>
                                 <b>
-                                    <a>6807</a>
+                                    <a>6806</a>
                                     <b>41956</b>
                                     <v>115</v>
                                 </b>
@@ -31190,7 +31195,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33831</v>
+                                    <v>33832</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31208,7 +31213,7 @@
                                     <v>3782</v>
                                 </b>
                                 <b>
-                                    <a>6807</a>
+                                    <a>6806</a>
                                     <b>41956</b>
                                     <v>115</v>
                                 </b>
@@ -31257,17 +31262,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>84982</v>
+                                    <v>85006</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>40565</v>
+                                    <v>40543</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>427774</v>
+                                    <v>427777</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -31288,17 +31293,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>84982</v>
+                                    <v>85006</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>40565</v>
+                                    <v>40543</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>427774</v>
+                                    <v>427777</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -31319,7 +31324,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>119345</v>
+                                    <v>119346</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31329,7 +31334,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>445209</v>
+                                    <v>445212</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -31344,15 +31349,15 @@
         </relation>
         <relation>
             <name>varbind</name>
-            <cardinality>8226118</cardinality>
+            <cardinality>8226107</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>8226118</v>
+                    <v>8226107</v>
                 </e>
                 <e>
                     <k>var</k>
-                    <v>1047519</v>
+                    <v>1047517</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -31366,7 +31371,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8226118</v>
+                                    <v>8226107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31437,15 +31442,15 @@
         </relation>
         <relation>
             <name>funbind</name>
-            <cardinality>6230323</cardinality>
+            <cardinality>6230372</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>6227671</v>
+                    <v>6227720</v>
                 </e>
                 <e>
                     <k>fun</k>
-                    <v>295537</v>
+                    <v>295540</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -31459,7 +31464,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6225019</v>
+                                    <v>6225068</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31480,7 +31485,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>194319</v>
+                                    <v>194320</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31510,11 +31515,11 @@
         </relation>
         <relation>
             <name>expr_allocator</name>
-            <cardinality>57053</cardinality>
+            <cardinality>57054</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>57053</v>
+                    <v>57054</v>
                 </e>
                 <e>
                     <k>func</k>
@@ -31536,7 +31541,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>57053</v>
+                                    <v>57054</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31552,7 +31557,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>57053</v>
+                                    <v>57054</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31783,15 +31788,15 @@
         </relation>
         <relation>
             <name>expr_cond_guard</name>
-            <cardinality>896445</cardinality>
+            <cardinality>896444</cardinality>
             <columnsizes>
                 <e>
                     <k>cond</k>
-                    <v>896445</v>
+                    <v>896444</v>
                 </e>
                 <e>
                     <k>guard</k>
-                    <v>896445</v>
+                    <v>896444</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -31805,7 +31810,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>896445</v>
+                                    <v>896444</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31821,7 +31826,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>896445</v>
+                                    <v>896444</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31831,15 +31836,15 @@
         </relation>
         <relation>
             <name>expr_cond_true</name>
-            <cardinality>896442</cardinality>
+            <cardinality>896441</cardinality>
             <columnsizes>
                 <e>
                     <k>cond</k>
-                    <v>896442</v>
+                    <v>896441</v>
                 </e>
                 <e>
                     <k>true</k>
-                    <v>896442</v>
+                    <v>896441</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -31853,7 +31858,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>896442</v>
+                                    <v>896441</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31869,7 +31874,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>896442</v>
+                                    <v>896441</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31879,15 +31884,15 @@
         </relation>
         <relation>
             <name>expr_cond_false</name>
-            <cardinality>896445</cardinality>
+            <cardinality>896444</cardinality>
             <columnsizes>
                 <e>
                     <k>cond</k>
-                    <v>896445</v>
+                    <v>896444</v>
                 </e>
                 <e>
                     <k>false</k>
-                    <v>896445</v>
+                    <v>896444</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -31901,7 +31906,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>896445</v>
+                                    <v>896444</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31917,7 +31922,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>896445</v>
+                                    <v>896444</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31927,11 +31932,11 @@
         </relation>
         <relation>
             <name>values</name>
-            <cardinality>14099266</cardinality>
+            <cardinality>14099248</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>14099266</v>
+                    <v>14099248</v>
                 </e>
                 <e>
                     <k>str</k>
@@ -31949,7 +31954,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14099266</v>
+                                    <v>14099248</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31995,11 +32000,11 @@
         </relation>
         <relation>
             <name>valuetext</name>
-            <cardinality>6605852</cardinality>
+            <cardinality>6605626</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6605852</v>
+                    <v>6605626</v>
                 </e>
                 <e>
                     <k>text</k>
@@ -32017,7 +32022,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6605852</v>
+                                    <v>6605626</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32047,7 +32052,7 @@
                                 </b>
                                 <b>
                                     <a>7</a>
-                                    <b>593266</b>
+                                    <b>593260</b>
                                     <v>27560</v>
                                 </b>
                             </bs>
@@ -32058,15 +32063,15 @@
         </relation>
         <relation>
             <name>valuebind</name>
-            <cardinality>14484502</cardinality>
+            <cardinality>14484483</cardinality>
             <columnsizes>
                 <e>
                     <k>val</k>
-                    <v>14099266</v>
+                    <v>14099248</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>14484502</v>
+                    <v>14484483</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32080,7 +32085,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13735597</v>
+                                    <v>13735579</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -32101,7 +32106,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14484502</v>
+                                    <v>14484483</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32111,11 +32116,11 @@
         </relation>
         <relation>
             <name>fieldoffsets</name>
-            <cardinality>1441780</cardinality>
+            <cardinality>1441778</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1441780</v>
+                    <v>1441778</v>
                 </e>
                 <e>
                     <k>byteoffset</k>
@@ -32137,7 +32142,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1441780</v>
+                                    <v>1441778</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32153,7 +32158,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1441780</v>
+                                    <v>1441778</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32538,23 +32543,23 @@
         </relation>
         <relation>
             <name>initialisers</name>
-            <cardinality>2336673</cardinality>
+            <cardinality>2336670</cardinality>
             <columnsizes>
                 <e>
                     <k>init</k>
-                    <v>2336673</v>
+                    <v>2336670</v>
                 </e>
                 <e>
                     <k>var</k>
-                    <v>983091</v>
+                    <v>983090</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>2336673</v>
+                    <v>2336670</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>539035</v>
+                    <v>539034</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32568,7 +32573,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2336673</v>
+                                    <v>2336670</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32584,7 +32589,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2336673</v>
+                                    <v>2336670</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32600,7 +32605,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2336673</v>
+                                    <v>2336670</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32616,7 +32621,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>865934</v>
+                                    <v>865933</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -32642,7 +32647,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>865934</v>
+                                    <v>865933</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -32668,7 +32673,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>983082</v>
+                                    <v>983081</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -32689,7 +32694,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2336673</v>
+                                    <v>2336670</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32705,7 +32710,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2336673</v>
+                                    <v>2336670</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32721,7 +32726,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2336673</v>
+                                    <v>2336670</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32768,7 +32773,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>470682</v>
+                                    <v>470681</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -32819,26 +32824,26 @@
         </relation>
         <relation>
             <name>braced_initialisers</name>
-            <cardinality>74272</cardinality>
+            <cardinality>74303</cardinality>
             <columnsizes>
                 <e>
                     <k>init</k>
-                    <v>74272</v>
+                    <v>74303</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>expr_ancestor</name>
-            <cardinality>1798179</cardinality>
+            <cardinality>1798193</cardinality>
             <columnsizes>
                 <e>
                     <k>exp</k>
-                    <v>1798179</v>
+                    <v>1798193</v>
                 </e>
                 <e>
                     <k>ancestor</k>
-                    <v>899966</v>
+                    <v>899973</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32852,7 +32857,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1798179</v>
+                                    <v>1798193</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32873,12 +32878,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>870862</v>
+                                    <v>870868</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>19</b>
-                                    <v>10792</v>
+                                    <v>10793</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32888,11 +32893,11 @@
         </relation>
         <relation>
             <name>exprs</name>
-            <cardinality>25135886</cardinality>
+            <cardinality>25135853</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>25135886</v>
+                    <v>25135853</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -32900,7 +32905,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>11535483</v>
+                    <v>11535468</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32914,7 +32919,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25135886</v>
+                                    <v>25135853</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32930,7 +32935,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25135886</v>
+                                    <v>25135853</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33108,17 +33113,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9705673</v>
+                                    <v>9705660</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>898510</v>
+                                    <v>898509</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>16</b>
-                                    <v>866991</v>
+                                    <v>866990</v>
                                 </b>
                                 <b>
                                     <a>16</a>
@@ -33139,17 +33144,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9853416</v>
+                                    <v>9853403</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>844293</v>
+                                    <v>844292</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>32</b>
-                                    <v>837774</v>
+                                    <v>837773</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33159,15 +33164,15 @@
         </relation>
         <relation>
             <name>expr_reuse</name>
-            <cardinality>907876</cardinality>
+            <cardinality>907883</cardinality>
             <columnsizes>
                 <e>
                     <k>reuse</k>
-                    <v>907876</v>
+                    <v>907883</v>
                 </e>
                 <e>
                     <k>original</k>
-                    <v>907876</v>
+                    <v>907883</v>
                 </e>
                 <e>
                     <k>value_category</k>
@@ -33185,7 +33190,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>907876</v>
+                                    <v>907883</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33201,7 +33206,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>907876</v>
+                                    <v>907883</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33217,7 +33222,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>907876</v>
+                                    <v>907883</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33233,7 +33238,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>907876</v>
+                                    <v>907883</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33285,11 +33290,11 @@
         </relation>
         <relation>
             <name>expr_types</name>
-            <cardinality>25135886</cardinality>
+            <cardinality>25135853</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>25135886</v>
+                    <v>25135853</v>
                 </e>
                 <e>
                     <k>typeid</k>
@@ -33311,7 +33316,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25135886</v>
+                                    <v>25135853</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33327,7 +33332,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25135886</v>
+                                    <v>25135853</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33472,11 +33477,11 @@
         </relation>
         <relation>
             <name>new_allocated_type</name>
-            <cardinality>58256</cardinality>
+            <cardinality>58257</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>58256</v>
+                    <v>58257</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -33494,7 +33499,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>58256</v>
+                                    <v>58257</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33515,7 +33520,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>18258</v>
+                                    <v>18259</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -34600,15 +34605,15 @@
         </relation>
         <relation>
             <name>condition_decl_bind</name>
-            <cardinality>438290</cardinality>
+            <cardinality>438294</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>438290</v>
+                    <v>438294</v>
                 </e>
                 <e>
                     <k>decl</k>
-                    <v>438290</v>
+                    <v>438294</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34622,7 +34627,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>438290</v>
+                                    <v>438294</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34638,7 +34643,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>438290</v>
+                                    <v>438294</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34648,11 +34653,11 @@
         </relation>
         <relation>
             <name>typeid_bind</name>
-            <cardinality>60404</cardinality>
+            <cardinality>60405</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>60404</v>
+                    <v>60405</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -34670,7 +34675,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>60404</v>
+                                    <v>60405</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34706,11 +34711,11 @@
         </relation>
         <relation>
             <name>uuidof_bind</name>
-            <cardinality>27728</cardinality>
+            <cardinality>27727</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>27728</v>
+                    <v>27727</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -34728,7 +34733,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27728</v>
+                                    <v>27727</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34759,11 +34764,11 @@
         </relation>
         <relation>
             <name>sizeof_bind</name>
-            <cardinality>245235</cardinality>
+            <cardinality>245234</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>245235</v>
+                    <v>245234</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -34781,7 +34786,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>245235</v>
+                                    <v>245234</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36365,11 +36370,11 @@
         </relation>
         <relation>
             <name>stmts</name>
-            <cardinality>6324268</cardinality>
+            <cardinality>6324260</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6324268</v>
+                    <v>6324260</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -36377,7 +36382,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2966233</v>
+                    <v>2966229</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36391,7 +36396,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6324268</v>
+                                    <v>6324260</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36407,7 +36412,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6324268</v>
+                                    <v>6324260</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36635,7 +36640,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2357136</v>
+                                    <v>2357133</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -36645,7 +36650,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>228596</v>
+                                    <v>228595</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -36666,7 +36671,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2892635</v>
+                                    <v>2892631</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -36775,6 +36780,17 @@
                 </dep>
             </dependencies>
         </relation>
+        <relation>
+            <name>type_is_vla</name>
+            <cardinality>47</cardinality>
+            <columnsizes>
+                <e>
+                    <k>type_id</k>
+                    <v>47</v>
+                </e>
+            </columnsizes>
+            <dependencies/>
+        </relation>
         <relation>
             <name>if_initialization</name>
             <cardinality>403</cardinality>
@@ -36825,15 +36841,15 @@
         </relation>
         <relation>
             <name>if_then</name>
-            <cardinality>987521</cardinality>
+            <cardinality>987520</cardinality>
             <columnsizes>
                 <e>
                     <k>if_stmt</k>
-                    <v>987521</v>
+                    <v>987520</v>
                 </e>
                 <e>
                     <k>then_id</k>
-                    <v>987521</v>
+                    <v>987520</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36847,7 +36863,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>987521</v>
+                                    <v>987520</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36863,7 +36879,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>987521</v>
+                                    <v>987520</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36873,15 +36889,15 @@
         </relation>
         <relation>
             <name>if_else</name>
-            <cardinality>468501</cardinality>
+            <cardinality>468505</cardinality>
             <columnsizes>
                 <e>
                     <k>if_stmt</k>
-                    <v>468501</v>
+                    <v>468505</v>
                 </e>
                 <e>
                     <k>else_id</k>
-                    <v>468501</v>
+                    <v>468505</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36895,7 +36911,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>468501</v>
+                                    <v>468505</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36911,7 +36927,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>468501</v>
+                                    <v>468505</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37305,11 +37321,11 @@
         </relation>
         <relation>
             <name>switch_case</name>
-            <cardinality>896207</cardinality>
+            <cardinality>896214</cardinality>
             <columnsizes>
                 <e>
                     <k>switch_stmt</k>
-                    <v>441450</v>
+                    <v>441453</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -37317,7 +37333,7 @@
                 </e>
                 <e>
                     <k>case_id</k>
-                    <v>896207</v>
+                    <v>896214</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37336,7 +37352,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>438359</v>
+                                    <v>438363</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -37362,7 +37378,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>438359</v>
+                                    <v>438363</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -37525,7 +37541,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>896207</v>
+                                    <v>896214</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37541,7 +37557,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>896207</v>
+                                    <v>896214</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37551,15 +37567,15 @@
         </relation>
         <relation>
             <name>switch_body</name>
-            <cardinality>441450</cardinality>
+            <cardinality>441453</cardinality>
             <columnsizes>
                 <e>
                     <k>switch_stmt</k>
-                    <v>441450</v>
+                    <v>441453</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>441450</v>
+                    <v>441453</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37573,7 +37589,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>441450</v>
+                                    <v>441453</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37589,7 +37605,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>441450</v>
+                                    <v>441453</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37791,11 +37807,11 @@
         </relation>
         <relation>
             <name>stmtparents</name>
-            <cardinality>5536444</cardinality>
+            <cardinality>5536437</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5536444</v>
+                    <v>5536437</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -37803,7 +37819,7 @@
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>2349075</v>
+                    <v>2349072</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37817,7 +37833,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5536444</v>
+                                    <v>5536437</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37833,7 +37849,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5536444</v>
+                                    <v>5536437</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37971,12 +37987,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1349054</v>
+                                    <v>1349052</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>508948</v>
+                                    <v>508947</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -37991,7 +38007,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>17</b>
-                                    <v>178120</v>
+                                    <v>178119</v>
                                 </b>
                                 <b>
                                     <a>17</a>
@@ -38012,12 +38028,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1349054</v>
+                                    <v>1349052</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>508948</v>
+                                    <v>508947</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -38032,7 +38048,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>17</b>
-                                    <v>178120</v>
+                                    <v>178119</v>
                                 </b>
                                 <b>
                                     <a>17</a>
@@ -38047,11 +38063,11 @@
         </relation>
         <relation>
             <name>ishandler</name>
-            <cardinality>47521</cardinality>
+            <cardinality>47475</cardinality>
             <columnsizes>
                 <e>
                     <k>block</k>
-                    <v>47521</v>
+                    <v>47475</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -38084,7 +38100,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>668063</v>
+                                    <v>668062</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -38105,7 +38121,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>668063</v>
+                                    <v>668062</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -38170,7 +38186,7 @@
                                 </b>
                                 <b>
                                     <a>5480</a>
-                                    <b>170179</b>
+                                    <b>170178</b>
                                     <v>8</v>
                                 </b>
                             </bs>
@@ -38231,7 +38247,7 @@
                                 </b>
                                 <b>
                                     <a>5480</a>
-                                    <b>170162</b>
+                                    <b>170161</b>
                                     <v>8</v>
                                 </b>
                             </bs>
@@ -38248,7 +38264,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>730668</v>
+                                    <v>730667</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -38305,7 +38321,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>668063</v>
+                                    <v>668062</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -38326,7 +38342,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>668063</v>
+                                    <v>668062</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -38391,7 +38407,7 @@
                                 </b>
                                 <b>
                                     <a>5480</a>
-                                    <b>170179</b>
+                                    <b>170178</b>
                                     <v>8</v>
                                 </b>
                             </bs>
@@ -38452,7 +38468,7 @@
                                 </b>
                                 <b>
                                     <a>5480</a>
-                                    <b>170179</b>
+                                    <b>170178</b>
                                     <v>8</v>
                                 </b>
                             </bs>
@@ -38495,15 +38511,15 @@
         </relation>
         <relation>
             <name>blockscope</name>
-            <cardinality>1838725</cardinality>
+            <cardinality>1838723</cardinality>
             <columnsizes>
                 <e>
                     <k>block</k>
-                    <v>1838725</v>
+                    <v>1838723</v>
                 </e>
                 <e>
                     <k>enclosing</k>
-                    <v>1575685</v>
+                    <v>1575683</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -38517,7 +38533,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1838725</v>
+                                    <v>1838723</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38533,7 +38549,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1400369</v>
+                                    <v>1400368</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -38543,7 +38559,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>28</b>
-                                    <v>45477</v>
+                                    <v>45476</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38553,11 +38569,11 @@
         </relation>
         <relation>
             <name>jumpinfo</name>
-            <cardinality>347365</cardinality>
+            <cardinality>347364</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>347365</v>
+                    <v>347364</v>
                 </e>
                 <e>
                     <k>str</k>
@@ -38579,7 +38595,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347365</v>
+                                    <v>347364</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38595,7 +38611,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347365</v>
+                                    <v>347364</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38698,7 +38714,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>7359</v>
+                                    <v>7358</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -38734,11 +38750,11 @@
         </relation>
         <relation>
             <name>preprocdirects</name>
-            <cardinality>5704677</cardinality>
+            <cardinality>5704669</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5704677</v>
+                    <v>5704669</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -38746,7 +38762,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5701313</v>
+                    <v>5701306</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -38760,7 +38776,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5704677</v>
+                                    <v>5704669</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38776,7 +38792,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5704677</v>
+                                    <v>5704669</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38924,7 +38940,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5701179</v>
+                                    <v>5701171</v>
                                 </b>
                                 <b>
                                     <a>26</a>
@@ -38945,7 +38961,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5701313</v>
+                                    <v>5701306</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38955,15 +38971,15 @@
         </relation>
         <relation>
             <name>preprocpair</name>
-            <cardinality>1103827</cardinality>
+            <cardinality>1103825</cardinality>
             <columnsizes>
                 <e>
                     <k>begin</k>
-                    <v>846303</v>
+                    <v>846302</v>
                 </e>
                 <e>
                     <k>elseelifend</k>
-                    <v>1103827</v>
+                    <v>1103825</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -38977,7 +38993,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>601561</v>
+                                    <v>601560</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -39003,7 +39019,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1103827</v>
+                                    <v>1103825</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39013,11 +39029,11 @@
         </relation>
         <relation>
             <name>preproctrue</name>
-            <cardinality>388573</cardinality>
+            <cardinality>388572</cardinality>
             <columnsizes>
                 <e>
                     <k>branch</k>
-                    <v>388573</v>
+                    <v>388572</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -39035,19 +39051,19 @@
         </relation>
         <relation>
             <name>preproctext</name>
-            <cardinality>4599773</cardinality>
+            <cardinality>4690318</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4599773</v>
+                    <v>4690318</v>
                 </e>
                 <e>
                     <k>head</k>
-                    <v>3333547</v>
+                    <v>3333139</v>
                 </e>
                 <e>
                     <k>body</k>
-                    <v>1948247</v>
+                    <v>1948244</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -39061,7 +39077,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4599773</v>
+                                    <v>4690318</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39077,7 +39093,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4599773</v>
+                                    <v>4690318</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39093,12 +39109,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3143970</v>
+                                    <v>3143697</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>740</b>
-                                    <v>189577</v>
+                                    <v>189442</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39114,7 +39130,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3253357</v>
+                                    <v>3252949</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -39135,7 +39151,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1763648</v>
+                                    <v>1763645</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -39144,7 +39160,7 @@
                                 </b>
                                 <b>
                                     <a>6</a>
-                                    <b>11630</b>
+                                    <b>12303</b>
                                     <v>38480</v>
                                 </b>
                             </bs>
@@ -39161,16 +39177,16 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1767549</v>
+                                    <v>1767547</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>146522</v>
+                                    <v>146521</v>
                                 </b>
                                 <b>
                                     <a>7</a>
-                                    <b>2980</b>
+                                    <b>2977</b>
                                     <v>34175</v>
                                 </b>
                             </bs>
@@ -39181,15 +39197,15 @@
         </relation>
         <relation>
             <name>includes</name>
-            <cardinality>408672</cardinality>
+            <cardinality>408674</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>408672</v>
+                    <v>408674</v>
                 </e>
                 <e>
                     <k>included</k>
-                    <v>75280</v>
+                    <v>75281</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -39203,7 +39219,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>408672</v>
+                                    <v>408674</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39307,11 +39323,11 @@
         </relation>
         <relation>
             <name>link_parent</name>
-            <cardinality>38279006</cardinality>
+            <cardinality>38313696</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
-                    <v>4869162</v>
+                    <v>4873064</v>
                 </e>
                 <e>
                     <k>link_target</k>
@@ -39329,17 +39345,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>668749</v>
+                                    <v>668840</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>9</b>
-                                    <v>34026</v>
+                                    <v>33983</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>4166386</v>
+                                    <v>4170240</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39358,48 +39374,48 @@
                                     <v>42</v>
                                 </b>
                                 <b>
-                                    <a>97236</a>
-                                    <b>97237</b>
+                                    <a>97325</a>
+                                    <b>97326</b>
                                     <v>42</v>
                                 </b>
                                 <b>
-                                    <a>97355</a>
-                                    <b>97356</b>
+                                    <a>97444</a>
+                                    <b>97445</b>
                                     <v>42</v>
                                 </b>
                                 <b>
-                                    <a>97408</a>
-                                    <b>97409</b>
+                                    <a>97497</a>
+                                    <b>97498</b>
                                     <v>42</v>
                                 </b>
                                 <b>
-                                    <a>97435</a>
-                                    <b>97436</b>
+                                    <a>97524</a>
+                                    <b>97525</b>
                                     <v>42</v>
                                 </b>
                                 <b>
-                                    <a>97457</a>
-                                    <b>97458</b>
+                                    <a>97546</a>
+                                    <b>97547</b>
                                     <v>42</v>
                                 </b>
                                 <b>
-                                    <a>97490</a>
-                                    <b>97491</b>
+                                    <a>97578</a>
+                                    <b>97579</b>
                                     <v>42</v>
                                 </b>
                                 <b>
-                                    <a>99496</a>
-                                    <b>99497</b>
+                                    <a>99585</a>
+                                    <b>99586</b>
                                     <v>42</v>
                                 </b>
                                 <b>
-                                    <a>102875</a>
-                                    <b>102876</b>
+                                    <a>102965</a>
+                                    <b>102966</b>
                                     <v>42</v>
                                 </b>
                                 <b>
-                                    <a>104238</a>
-                                    <b>104239</b>
+                                    <a>104327</a>
+                                    <b>104328</b>
                                     <v>42</v>
                                 </b>
                             </bs>
diff --git a/cpp/ql/lib/upgrades/e594389175c098d7225683d0fd8cefcc47d84bc1/old.dbscheme b/cpp/ql/lib/upgrades/e594389175c098d7225683d0fd8cefcc47d84bc1/old.dbscheme
new file mode 100644
index 000000000000..e594389175c0
--- /dev/null
+++ b/cpp/ql/lib/upgrades/e594389175c098d7225683d0fd8cefcc47d84bc1/old.dbscheme
@@ -0,0 +1,2444 @@
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+    int id : @externalDataElement,
+    string path : string ref,
+    int column: int ref,
+    string value : string ref
+);
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/**
+ * Information about packages that provide code used during compilation.
+ * The `id` is just a unique identifier.
+ * The `namespace` is typically the name of the package manager that
+ * provided the package (e.g. "dpkg" or "yum").
+ * The `package_name` is the name of the package, and `version` is its
+ * version (as a string).
+ */
+external_packages(
+    unique int id: @external_package,
+    string namespace : string ref,
+    string package_name : string ref,
+    string version : string ref
+);
+
+/**
+ * Holds if File `fileid` was provided by package `package`.
+ */
+header_to_external_package(
+    int fileid : @file ref,
+    int package : @external_package ref
+);
+
+/*
+ * Version history
+ */
+
+svnentries(
+    unique int id : @svnentry,
+    string revision : string ref,
+    string author : string ref,
+    date revisionDate : date ref,
+    int changeSize : int ref
+)
+
+svnaffectedfiles(
+    int id : @svnentry ref,
+    int file : @file ref,
+    string action : string ref
+)
+
+svnentrymsg(
+    unique int id : @svnentry ref,
+    string message : string ref
+)
+
+svnchurn(
+    int commit : @svnentry ref,
+    int file : @file ref,
+    int addedLines : int ref,
+    int deletedLines : int ref
+)
+
+/*
+ * C++ dbscheme
+ */
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+@location = @location_stmt | @location_expr | @location_default ;
+
+/**
+ * The location of an element that is not an expression or a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+    /** The location of an element that is not an expression or a statement. */
+    unique int id: @location_default,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_stmt(
+    /** The location of a statement. */
+    unique int id: @location_stmt,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of an expression.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_expr(
+    /** The location of an expression. */
+    unique int id: @location_expr,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+numlines(
+    int element_id: @sourceline ref,
+    int num_lines: int ref,
+    int num_code: int ref,
+    int num_comment: int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location_default ref
+);
+
+files(
+    unique int id: @file,
+    string name: string ref
+);
+
+folders(
+    unique int id: @folder,
+    string name: string ref
+);
+
+@container = @folder | @file
+
+containerparent(
+    int parent: @container ref,
+    unique int child: @container ref
+);
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+/*
+case @function.kind of
+  1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+| 6 = @builtin_function     // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+*/
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * would change the semantics of this decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+case @usertype.kind of
+|  0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+*/
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      /* TODO | @fixedpointtype */
+      | @routinetype
+      | @ptrtomember
+      | @decltype;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_expr ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_expr ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_stmt ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/* XML Files */
+
+xmlEncoding(unique int id: @file ref, string encoding: string ref);
+
+xmlDTDs(
+    unique int id: @xmldtd,
+    string root: string ref,
+    string publicId: string ref,
+    string systemId: string ref,
+    int fileid: @file ref
+);
+
+xmlElements(
+    unique int id: @xmlelement,
+    string name: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlAttrs(
+    unique int id: @xmlattribute,
+    int elementid: @xmlelement ref,
+    string name: string ref,
+    string value: string ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlNs(
+    int id: @xmlnamespace,
+    string prefixName: string ref,
+    string URI: string ref,
+    int fileid: @file ref
+);
+
+xmlHasNs(
+    int elementId: @xmlnamespaceable ref,
+    int nsId: @xmlnamespace ref,
+    int fileid: @file ref
+);
+
+xmlComments(
+    unique int id: @xmlcomment,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int fileid: @file ref
+);
+
+xmlChars(
+    unique int id: @xmlcharacters,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int isCDATA: int ref,
+    int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+    int xmlElement: @xmllocatable ref,
+    int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters
+              | @xmlelement
+              | @xmlcomment
+              | @xmlattribute
+              | @xmldtd
+              | @file
+              | @xmlnamespace;
diff --git a/cpp/ql/lib/upgrades/e594389175c098d7225683d0fd8cefcc47d84bc1/semmlecode.cpp.dbscheme b/cpp/ql/lib/upgrades/e594389175c098d7225683d0fd8cefcc47d84bc1/semmlecode.cpp.dbscheme
new file mode 100644
index 000000000000..0f0a390468a5
--- /dev/null
+++ b/cpp/ql/lib/upgrades/e594389175c098d7225683d0fd8cefcc47d84bc1/semmlecode.cpp.dbscheme
@@ -0,0 +1,2446 @@
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+    int id : @externalDataElement,
+    string path : string ref,
+    int column: int ref,
+    string value : string ref
+);
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/**
+ * Information about packages that provide code used during compilation.
+ * The `id` is just a unique identifier.
+ * The `namespace` is typically the name of the package manager that
+ * provided the package (e.g. "dpkg" or "yum").
+ * The `package_name` is the name of the package, and `version` is its
+ * version (as a string).
+ */
+external_packages(
+    unique int id: @external_package,
+    string namespace : string ref,
+    string package_name : string ref,
+    string version : string ref
+);
+
+/**
+ * Holds if File `fileid` was provided by package `package`.
+ */
+header_to_external_package(
+    int fileid : @file ref,
+    int package : @external_package ref
+);
+
+/*
+ * Version history
+ */
+
+svnentries(
+    unique int id : @svnentry,
+    string revision : string ref,
+    string author : string ref,
+    date revisionDate : date ref,
+    int changeSize : int ref
+)
+
+svnaffectedfiles(
+    int id : @svnentry ref,
+    int file : @file ref,
+    string action : string ref
+)
+
+svnentrymsg(
+    unique int id : @svnentry ref,
+    string message : string ref
+)
+
+svnchurn(
+    int commit : @svnentry ref,
+    int file : @file ref,
+    int addedLines : int ref,
+    int deletedLines : int ref
+)
+
+/*
+ * C++ dbscheme
+ */
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+@location = @location_stmt | @location_expr | @location_default ;
+
+/**
+ * The location of an element that is not an expression or a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+    /** The location of an element that is not an expression or a statement. */
+    unique int id: @location_default,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_stmt(
+    /** The location of a statement. */
+    unique int id: @location_stmt,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of an expression.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_expr(
+    /** The location of an expression. */
+    unique int id: @location_expr,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+numlines(
+    int element_id: @sourceline ref,
+    int num_lines: int ref,
+    int num_code: int ref,
+    int num_comment: int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location_default ref
+);
+
+files(
+    unique int id: @file,
+    string name: string ref
+);
+
+folders(
+    unique int id: @folder,
+    string name: string ref
+);
+
+@container = @folder | @file
+
+containerparent(
+    int parent: @container ref,
+    unique int child: @container ref
+);
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+/*
+case @function.kind of
+  1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+| 6 = @builtin_function     // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+*/
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * would change the semantics of this decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+case @usertype.kind of
+|  0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+*/
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      /* TODO | @fixedpointtype */
+      | @routinetype
+      | @ptrtomember
+      | @decltype;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_expr ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_expr ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_stmt ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+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;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/* XML Files */
+
+xmlEncoding(unique int id: @file ref, string encoding: string ref);
+
+xmlDTDs(
+    unique int id: @xmldtd,
+    string root: string ref,
+    string publicId: string ref,
+    string systemId: string ref,
+    int fileid: @file ref
+);
+
+xmlElements(
+    unique int id: @xmlelement,
+    string name: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlAttrs(
+    unique int id: @xmlattribute,
+    int elementid: @xmlelement ref,
+    string name: string ref,
+    string value: string ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlNs(
+    int id: @xmlnamespace,
+    string prefixName: string ref,
+    string URI: string ref,
+    int fileid: @file ref
+);
+
+xmlHasNs(
+    int elementId: @xmlnamespaceable ref,
+    int nsId: @xmlnamespace ref,
+    int fileid: @file ref
+);
+
+xmlComments(
+    unique int id: @xmlcomment,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int fileid: @file ref
+);
+
+xmlChars(
+    unique int id: @xmlcharacters,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int isCDATA: int ref,
+    int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+    int xmlElement: @xmllocatable ref,
+    int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters
+              | @xmlelement
+              | @xmlcomment
+              | @xmlattribute
+              | @xmldtd
+              | @file
+              | @xmlnamespace;
diff --git a/cpp/ql/lib/upgrades/e594389175c098d7225683d0fd8cefcc47d84bc1/upgrade.properties b/cpp/ql/lib/upgrades/e594389175c098d7225683d0fd8cefcc47d84bc1/upgrade.properties
new file mode 100644
index 000000000000..f6105ce157b4
--- /dev/null
+++ b/cpp/ql/lib/upgrades/e594389175c098d7225683d0fd8cefcc47d84bc1/upgrade.properties
@@ -0,0 +1,2 @@
+description:  Add a new predicate `isVla()` to the `ArrayType` class
+compatibility: backwards
\ No newline at end of file