diff --git a/cpp/downgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/exprs.ql b/cpp/downgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/exprs.ql
new file mode 100644
index 000000000000..5c335c836fb8
--- /dev/null
+++ b/cpp/downgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/exprs.ql
@@ -0,0 +1,15 @@
+class Expr extends @expr {
+  string toString() { none() }
+}
+
+class Location extends @location_expr {
+  string toString() { none() }
+}
+
+predicate isExprRequires(Expr expr) { exists(int kind | exprs(expr, kind, _) | kind = 390) }
+
+from Expr expr, int kind, int kind_new, Location location
+where
+  exprs(expr, kind, location) and
+  if isExprRequires(expr) then kind_new = 1 else kind_new = kind
+select expr, kind_new, location
diff --git a/cpp/downgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/old.dbscheme b/cpp/downgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/old.dbscheme
new file mode 100644
index 000000000000..6f5d51e89e76
--- /dev/null
+++ b/cpp/downgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/old.dbscheme
@@ -0,0 +1,2316 @@
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The 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
+);
+
+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_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable 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
+);
+
+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: @functionorblock 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
+   1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+|  5 = @typedef                       // classic C: typedef typedef type name
+|  6 = @template
+|  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                  // a using name = type style typedef
+;
+*/
+
+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
+);
+
+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
+);
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    unique int templ_param_id: @usertype 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
+);
+
+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;
+
+@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
+;
+
+@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
+            ;
+
+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
+);
+
+@runtime_sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof;
+
+sizeof_bind(
+    unique int expr: @runtime_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
+;
+
+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
+);
+
+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
+);
+
+@functionorblock = @function | @stmt_block;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @functionorblock 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
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif;
+
+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/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/semmlecode.cpp.dbscheme b/cpp/downgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/semmlecode.cpp.dbscheme
new file mode 100644
index 000000000000..7ff6a6e53dbc
--- /dev/null
+++ b/cpp/downgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/semmlecode.cpp.dbscheme
@@ -0,0 +1,2315 @@
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The 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
+);
+
+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_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable 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
+);
+
+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: @functionorblock 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
+   1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+|  5 = @typedef                       // classic C: typedef typedef type name
+|  6 = @template
+|  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                  // a using name = type style typedef
+;
+*/
+
+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
+);
+
+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
+);
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    unique int templ_param_id: @usertype 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
+);
+
+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;
+
+@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
+;
+
+@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
+            ;
+
+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
+);
+
+@runtime_sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof;
+
+sizeof_bind(
+    unique int expr: @runtime_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
+;
+
+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
+);
+
+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
+);
+
+@functionorblock = @function | @stmt_block;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @functionorblock 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
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif;
+
+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/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/upgrade.properties b/cpp/downgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/upgrade.properties
new file mode 100644
index 000000000000..89fbcd9b239e
--- /dev/null
+++ b/cpp/downgrades/6f5d51e89e762fe4609fd4ac8ee3afb04221e873/upgrade.properties
@@ -0,0 +1,3 @@
+description: Add requires expr
+compatibility: partial
+exprs.rel: run exprs.qlo
diff --git a/cpp/ql/lib/change-notes/2024-10-07-range-analysis-of-getc.md b/cpp/ql/lib/change-notes/2024-10-07-range-analysis-of-getc.md
new file mode 100644
index 000000000000..f796fba2ece2
--- /dev/null
+++ b/cpp/ql/lib/change-notes/2024-10-07-range-analysis-of-getc.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* The `SimpleRangeAnalysis` library (`semmle.code.cpp.rangeanalysis.SimpleRangeAnalysis`) now generates more precise ranges for calls to `fgetc` and `getc`.
\ No newline at end of file
diff --git a/cpp/ql/lib/cpp.qll b/cpp/ql/lib/cpp.qll
index 0a29f7b86bac..5162248c4b85 100644
--- a/cpp/ql/lib/cpp.qll
+++ b/cpp/ql/lib/cpp.qll
@@ -17,6 +17,7 @@ import semmle.code.cpp.File
 import semmle.code.cpp.Linkage
 import semmle.code.cpp.Location
 import semmle.code.cpp.Compilation
+import semmle.code.cpp.Concept
 import semmle.code.cpp.Element
 import semmle.code.cpp.Namespace
 import semmle.code.cpp.Specifier
diff --git a/cpp/ql/lib/semmle/code/cpp/Concept.qll b/cpp/ql/lib/semmle/code/cpp/Concept.qll
new file mode 100644
index 000000000000..d6245ecea825
--- /dev/null
+++ b/cpp/ql/lib/semmle/code/cpp/Concept.qll
@@ -0,0 +1,14 @@
+/**
+ * Provides classes for working with C++ concepts.
+ */
+
+import semmle.code.cpp.exprs.Expr
+
+/**
+ * A C++ requires expression.
+ */
+class RequiresExpr extends Expr, @requires_expr {
+  override string toString() { result = "requires ..." }
+
+  override string getAPrimaryQlClass() { result = "RequiresExpr" }
+}
diff --git a/cpp/ql/lib/semmle/code/cpp/rangeanalysis/SimpleRangeAnalysis.qll b/cpp/ql/lib/semmle/code/cpp/rangeanalysis/SimpleRangeAnalysis.qll
index 1ce7a6a4f5a8..990def8b2f1c 100644
--- a/cpp/ql/lib/semmle/code/cpp/rangeanalysis/SimpleRangeAnalysis.qll
+++ b/cpp/ql/lib/semmle/code/cpp/rangeanalysis/SimpleRangeAnalysis.qll
@@ -192,6 +192,37 @@ private class UnsignedMulExpr extends MulExpr {
   }
 }
 
+/**
+ * Gets the value of the `EOF` macro.
+ *
+ * This is typically `"-1"`, but this is not guaranteed to be the case on all
+ * systems.
+ */
+private int getEofValue() {
+  exists(MacroInvocation mi |
+    mi.getMacroName() = "EOF" and
+    result = unique( | | mi.getExpr().getValue().toInt())
+  )
+}
+
+/** Get standard `getc` function or related variants. */
+private class Getc extends Function {
+  Getc() { this.hasGlobalOrStdOrBslName(["fgetc", "getc"]) }
+}
+
+/** A call to `getc` */
+private class CallToGetc extends FunctionCall {
+  CallToGetc() { this.getTarget() instanceof Getc }
+}
+
+/**
+ * A call to `getc` that we can analyze because we know
+ * the value of the `EOF` macro.
+ */
+private class AnalyzableCallToGetc extends CallToGetc {
+  AnalyzableCallToGetc() { exists(getEofValue()) }
+}
+
 /**
  * Holds if `expr` is effectively a multiplication of `operand` with the
  * positive constant `positive`.
@@ -287,6 +318,8 @@ private predicate analyzableExpr(Expr e) {
     or
     e instanceof RemExpr
     or
+    e instanceof AnalyzableCallToGetc
+    or
     // A conversion is analyzable, provided that its child has an arithmetic
     // type. (Sometimes the child is a reference type, and so does not get
     // any bounds.) Rather than checking whether the type of the child is
@@ -861,6 +894,14 @@ private float getLowerBoundsImpl(Expr expr) {
       )
     )
     or
+    exists(AnalyzableCallToGetc getc |
+      expr = getc and
+      // from https://en.cppreference.com/w/c/io/fgetc:
+      // On success, returns the obtained character as an unsigned char
+      // converted to an int. On failure, returns EOF.
+      result = min([typeLowerBound(any(UnsignedCharType pct)), getEofValue()])
+    )
+    or
     // If the conversion is to an arithmetic type then we just return the
     // lower bound of the child. We do not need to handle truncation and
     // overflow here, because that is done in `getTruncatedLowerBounds`.
@@ -1055,6 +1096,14 @@ private float getUpperBoundsImpl(Expr expr) {
       )
     )
     or
+    exists(AnalyzableCallToGetc getc |
+      expr = getc and
+      // from https://en.cppreference.com/w/c/io/fgetc:
+      // On success, returns the obtained character as an unsigned char
+      // converted to an int. On failure, returns EOF.
+      result = max([typeUpperBound(any(UnsignedCharType pct)), getEofValue()])
+    )
+    or
     // If the conversion is to an arithmetic type then we just return the
     // upper bound of the child. We do not need to handle truncation and
     // overflow here, because that is done in `getTruncatedUpperBounds`.
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme b/cpp/ql/lib/semmlecode.cpp.dbscheme
index 7ff6a6e53dbc..6f5d51e89e76 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme
@@ -1790,6 +1790,7 @@ case @expr.kind of
 | 387 = @istriviallyrelocatable
 | 388 = @datasizeof
 | 389 = @c11_generic
+| 390 = @requires_expr
 ;
 
 @var_args_expr = @vastartexpr
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
index 07045b0bd67a..20534e223c94 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>29765023</v>
+            <v>29768202</v>
         </e>
         <e>
             <k>@location_stmt</k>
-            <v>3819884</v>
+            <v>3819867</v>
         </e>
         <e>
             <k>@location_expr</k>
-            <v>13187951</v>
+            <v>13187892</v>
         </e>
         <e>
             <k>@diagnostic</k>
@@ -34,43 +34,43 @@
         </e>
         <e>
             <k>@file</k>
-            <v>123252</v>
+            <v>123267</v>
         </e>
         <e>
             <k>@folder</k>
-            <v>16340</v>
+            <v>16342</v>
         </e>
         <e>
             <k>@macro_expansion</k>
-            <v>33257908</v>
+            <v>33257556</v>
         </e>
         <e>
             <k>@other_macro_reference</k>
-            <v>859032</v>
+            <v>859138</v>
         </e>
         <e>
             <k>@function</k>
-            <v>4179381</v>
+            <v>4179893</v>
         </e>
         <e>
             <k>@fun_decl</k>
-            <v>4543537</v>
+            <v>4544093</v>
         </e>
         <e>
             <k>@var_decl</k>
-            <v>8039427</v>
+            <v>8040412</v>
         </e>
         <e>
             <k>@type_decl</k>
-            <v>3283466</v>
+            <v>3283868</v>
         </e>
         <e>
             <k>@namespace_decl</k>
-            <v>311638</v>
+            <v>311636</v>
         </e>
         <e>
             <k>@using_declaration</k>
-            <v>363221</v>
+            <v>363266</v>
         </e>
         <e>
             <k>@using_directive</k>
@@ -82,15 +82,15 @@
         </e>
         <e>
             <k>@static_assert</k>
-            <v>134702</v>
+            <v>134701</v>
         </e>
         <e>
             <k>@parameter</k>
-            <v>6190639</v>
+            <v>6191397</v>
         </e>
         <e>
             <k>@membervariable</k>
-            <v>1054697</v>
+            <v>1054692</v>
         </e>
         <e>
             <k>@globalvariable</k>
@@ -102,7 +102,7 @@
         </e>
         <e>
             <k>@enumconstant</k>
-            <v>241670</v>
+            <v>241669</v>
         </e>
         <e>
             <k>@errortype</k>
@@ -330,23 +330,23 @@
         </e>
         <e>
             <k>@pointer</k>
-            <v>568175</v>
+            <v>568245</v>
         </e>
         <e>
             <k>@type_with_specifiers</k>
-            <v>852029</v>
+            <v>852134</v>
         </e>
         <e>
             <k>@array</k>
-            <v>110180</v>
+            <v>110193</v>
         </e>
         <e>
             <k>@routineptr</k>
-            <v>625429</v>
+            <v>625426</v>
         </e>
         <e>
             <k>@reference</k>
-            <v>1276410</v>
+            <v>1276567</v>
         </e>
         <e>
             <k>@gnu_vector</k>
@@ -358,7 +358,7 @@
         </e>
         <e>
             <k>@rvalue_reference</k>
-            <v>333342</v>
+            <v>333382</v>
         </e>
         <e>
             <k>@block</k>
@@ -366,43 +366,43 @@
         </e>
         <e>
             <k>@decltype</k>
-            <v>27078</v>
+            <v>27081</v>
         </e>
         <e>
             <k>@usertype</k>
-            <v>5234965</v>
+            <v>5235606</v>
         </e>
         <e>
             <k>@mangledname</k>
-            <v>6061784</v>
+            <v>6062526</v>
         </e>
         <e>
             <k>@type_mention</k>
-            <v>4029136</v>
+            <v>4029118</v>
         </e>
         <e>
             <k>@routinetype</k>
-            <v>538824</v>
+            <v>538891</v>
         </e>
         <e>
             <k>@ptrtomember</k>
-            <v>37816</v>
+            <v>37820</v>
         </e>
         <e>
             <k>@specifier</k>
-            <v>24743</v>
+            <v>24746</v>
         </e>
         <e>
             <k>@gnuattribute</k>
-            <v>553702</v>
+            <v>553770</v>
         </e>
         <e>
             <k>@stdattribute</k>
-            <v>253563</v>
+            <v>253562</v>
         </e>
         <e>
             <k>@declspec</k>
-            <v>239153</v>
+            <v>239152</v>
         </e>
         <e>
             <k>@msattribute</k>
@@ -410,15 +410,15 @@
         </e>
         <e>
             <k>@alignas</k>
-            <v>4668</v>
+            <v>4669</v>
         </e>
         <e>
             <k>@attribute_arg_token</k>
-            <v>25210</v>
+            <v>25213</v>
         </e>
         <e>
             <k>@attribute_arg_constant_expr</k>
-            <v>318402</v>
+            <v>318441</v>
         </e>
         <e>
             <k>@attribute_arg_empty</k>
@@ -438,19 +438,19 @@
         </e>
         <e>
             <k>@derivation</k>
-            <v>391568</v>
+            <v>391566</v>
         </e>
         <e>
             <k>@frienddecl</k>
-            <v>707052</v>
+            <v>707049</v>
         </e>
         <e>
             <k>@comment</k>
-            <v>8266137</v>
+            <v>8266100</v>
         </e>
         <e>
             <k>@namespace</k>
-            <v>12138</v>
+            <v>12139</v>
         </e>
         <e>
             <k>@specialnamequalifyingelement</k>
@@ -458,15 +458,15 @@
         </e>
         <e>
             <k>@namequalifier</k>
-            <v>1513800</v>
+            <v>1513793</v>
         </e>
         <e>
             <k>@value</k>
-            <v>10776699</v>
+            <v>10776651</v>
         </e>
         <e>
             <k>@initialiser</k>
-            <v>1710781</v>
+            <v>1710773</v>
         </e>
         <e>
             <k>@address_of</k>
@@ -474,15 +474,15 @@
         </e>
         <e>
             <k>@indirect</k>
-            <v>292646</v>
+            <v>292644</v>
         </e>
         <e>
             <k>@array_to_pointer</k>
-            <v>1430838</v>
+            <v>1430832</v>
         </e>
         <e>
             <k>@parexpr</k>
-            <v>3587479</v>
+            <v>3587464</v>
         </e>
         <e>
             <k>@arithnegexpr</k>
@@ -498,7 +498,7 @@
         </e>
         <e>
             <k>@notexpr</k>
-            <v>276425</v>
+            <v>276424</v>
         </e>
         <e>
             <k>@postincrexpr</k>
@@ -518,19 +518,19 @@
         </e>
         <e>
             <k>@conditionalexpr</k>
-            <v>657237</v>
+            <v>657235</v>
         </e>
         <e>
             <k>@addexpr</k>
-            <v>398394</v>
+            <v>398392</v>
         </e>
         <e>
             <k>@subexpr</k>
-            <v>340758</v>
+            <v>340757</v>
         </e>
         <e>
             <k>@mulexpr</k>
-            <v>306356</v>
+            <v>306355</v>
         </e>
         <e>
             <k>@divexpr</k>
@@ -542,7 +542,7 @@
         </e>
         <e>
             <k>@paddexpr</k>
-            <v>86662</v>
+            <v>86661</v>
         </e>
         <e>
             <k>@psubexpr</k>
@@ -554,51 +554,51 @@
         </e>
         <e>
             <k>@lshiftexpr</k>
-            <v>566303</v>
+            <v>566300</v>
         </e>
         <e>
             <k>@rshiftexpr</k>
-            <v>140840</v>
+            <v>140839</v>
         </e>
         <e>
             <k>@andexpr</k>
-            <v>489056</v>
+            <v>489054</v>
         </e>
         <e>
             <k>@orexpr</k>
-            <v>145465</v>
+            <v>145464</v>
         </e>
         <e>
             <k>@xorexpr</k>
-            <v>54175</v>
+            <v>54174</v>
         </e>
         <e>
             <k>@eqexpr</k>
-            <v>470650</v>
+            <v>470648</v>
         </e>
         <e>
             <k>@neexpr</k>
-            <v>301667</v>
+            <v>301666</v>
         </e>
         <e>
             <k>@gtexpr</k>
-            <v>104111</v>
+            <v>104123</v>
         </e>
         <e>
             <k>@ltexpr</k>
-            <v>101776</v>
+            <v>101789</v>
         </e>
         <e>
             <k>@geexpr</k>
-            <v>59249</v>
+            <v>59248</v>
         </e>
         <e>
             <k>@leexpr</k>
-            <v>212526</v>
+            <v>212525</v>
         </e>
         <e>
             <k>@assignexpr</k>
-            <v>936957</v>
+            <v>936952</v>
         </e>
         <e>
             <k>@assignaddexpr</k>
@@ -614,7 +614,7 @@
         </e>
         <e>
             <k>@assigndivexpr</k>
-            <v>4994</v>
+            <v>4993</v>
         </e>
         <e>
             <k>@assignremexpr</k>
@@ -638,7 +638,7 @@
         </e>
         <e>
             <k>@assignxorexpr</k>
-            <v>21844</v>
+            <v>21843</v>
         </e>
         <e>
             <k>@assignpaddexpr</k>
@@ -650,15 +650,15 @@
         </e>
         <e>
             <k>@andlogicalexpr</k>
-            <v>249952</v>
+            <v>249951</v>
         </e>
         <e>
             <k>@orlogicalexpr</k>
-            <v>866110</v>
+            <v>866116</v>
         </e>
         <e>
             <k>@commaexpr</k>
-            <v>122841</v>
+            <v>122840</v>
         </e>
         <e>
             <k>@subscriptexpr</k>
@@ -666,7 +666,7 @@
         </e>
         <e>
             <k>@callexpr</k>
-            <v>316534</v>
+            <v>316533</v>
         </e>
         <e>
             <k>@vastartexpr</k>
@@ -686,11 +686,11 @@
         </e>
         <e>
             <k>@varaccess</k>
-            <v>6029127</v>
+            <v>6029100</v>
         </e>
         <e>
             <k>@runtime_sizeof</k>
-            <v>295836</v>
+            <v>295835</v>
         </e>
         <e>
             <k>@runtime_alignof</k>
@@ -698,27 +698,27 @@
         </e>
         <e>
             <k>@expr_stmt</k>
-            <v>94387</v>
+            <v>94386</v>
         </e>
         <e>
             <k>@routineexpr</k>
-            <v>3186314</v>
+            <v>3186299</v>
         </e>
         <e>
             <k>@type_operand</k>
-            <v>1128756</v>
+            <v>1128764</v>
         </e>
         <e>
             <k>@offsetofexpr</k>
-            <v>19993</v>
+            <v>19992</v>
         </e>
         <e>
             <k>@typescompexpr</k>
-            <v>563777</v>
+            <v>563781</v>
         </e>
         <e>
             <k>@literal</k>
-            <v>4406923</v>
+            <v>4406841</v>
         </e>
         <e>
             <k>@aggregateliteral</k>
@@ -730,7 +730,7 @@
         </e>
         <e>
             <k>@temp_init</k>
-            <v>794460</v>
+            <v>794456</v>
         </e>
         <e>
             <k>@errorexpr</k>
@@ -738,11 +738,11 @@
         </e>
         <e>
             <k>@reference_to</k>
-            <v>1572195</v>
+            <v>1572188</v>
         </e>
         <e>
             <k>@ref_indirect</k>
-            <v>1901648</v>
+            <v>1901640</v>
         </e>
         <e>
             <k>@vacuous_destructor_call</k>
@@ -802,7 +802,7 @@
         </e>
         <e>
             <k>@thisaccess</k>
-            <v>1116784</v>
+            <v>1116779</v>
         </e>
         <e>
             <k>@new_expr</k>
@@ -830,7 +830,7 @@
         </e>
         <e>
             <k>@sizeof_pack</k>
-            <v>5602</v>
+            <v>5603</v>
         </e>
         <e>
             <k>@hasassignexpr</k>
@@ -942,7 +942,7 @@
         </e>
         <e>
             <k>@ctorfieldinit</k>
-            <v>190976</v>
+            <v>190975</v>
         </e>
         <e>
             <k>@ctordelegatinginit</k>
@@ -962,7 +962,7 @@
         </e>
         <e>
             <k>@static_cast</k>
-            <v>215649</v>
+            <v>215647</v>
         </e>
         <e>
             <k>@reinterpret_cast</k>
@@ -978,11 +978,11 @@
         </e>
         <e>
             <k>@lambdaexpr</k>
-            <v>21475</v>
+            <v>21478</v>
         </e>
         <e>
             <k>@param_ref</k>
-            <v>235619</v>
+            <v>235618</v>
         </e>
         <e>
             <k>@noopexpr</k>
@@ -1022,7 +1022,7 @@
         </e>
         <e>
             <k>@istriviallycopyableexpr</k>
-            <v>3734</v>
+            <v>3735</v>
         </e>
         <e>
             <k>@isliteraltypeexpr</k>
@@ -1086,7 +1086,7 @@
         </e>
         <e>
             <k>@noexceptexpr</k>
-            <v>24641</v>
+            <v>24640</v>
         </e>
         <e>
             <k>@builtinshufflevector</k>
@@ -1258,7 +1258,7 @@
         </e>
         <e>
             <k>@reuseexpr</k>
-            <v>373719</v>
+            <v>373717</v>
         </e>
         <e>
             <k>@istriviallycopyassignable</k>
@@ -1356,25 +1356,29 @@
             <k>@c11_generic</k>
             <v>8</v>
         </e>
+        <e>
+            <k>@requires_expr</k>
+            <v>1</v>
+        </e>
         <e>
             <k>@lambdacapture</k>
-            <v>28011</v>
+            <v>28015</v>
         </e>
         <e>
             <k>@stmt_expr</k>
-            <v>1486025</v>
+            <v>1486018</v>
         </e>
         <e>
             <k>@stmt_if</k>
-            <v>725914</v>
+            <v>725911</v>
         </e>
         <e>
             <k>@stmt_while</k>
-            <v>29317</v>
+            <v>29316</v>
         </e>
         <e>
             <k>@stmt_goto</k>
-            <v>110691</v>
+            <v>110690</v>
         </e>
         <e>
             <k>@stmt_label</k>
@@ -1382,15 +1386,15 @@
         </e>
         <e>
             <k>@stmt_return</k>
-            <v>1280145</v>
+            <v>1280140</v>
         </e>
         <e>
             <k>@stmt_block</k>
-            <v>1419271</v>
+            <v>1419265</v>
         </e>
         <e>
             <k>@stmt_end_test_while</k>
-            <v>148874</v>
+            <v>148873</v>
         </e>
         <e>
             <k>@stmt_for</k>
@@ -1398,7 +1402,7 @@
         </e>
         <e>
             <k>@stmt_switch_case</k>
-            <v>207501</v>
+            <v>207500</v>
         </e>
         <e>
             <k>@stmt_switch</k>
@@ -1410,7 +1414,7 @@
         </e>
         <e>
             <k>@stmt_decl</k>
-            <v>593124</v>
+            <v>593118</v>
         </e>
         <e>
             <k>@stmt_empty</k>
@@ -1446,15 +1450,15 @@
         </e>
         <e>
             <k>@stmt_range_based_for</k>
-            <v>8403</v>
+            <v>8404</v>
         </e>
         <e>
             <k>@stmt_handler</k>
-            <v>62676</v>
+            <v>62675</v>
         </e>
         <e>
             <k>@stmt_constexpr_if</k>
-            <v>52998</v>
+            <v>52997</v>
         </e>
         <e>
             <k>@stmt_co_return</k>
@@ -1462,39 +1466,39 @@
         </e>
         <e>
             <k>@ppd_if</k>
-            <v>667151</v>
+            <v>667232</v>
         </e>
         <e>
             <k>@ppd_ifdef</k>
-            <v>263312</v>
+            <v>263344</v>
         </e>
         <e>
             <k>@ppd_ifndef</k>
-            <v>266580</v>
+            <v>266612</v>
         </e>
         <e>
             <k>@ppd_elif</k>
-            <v>25210</v>
+            <v>25213</v>
         </e>
         <e>
             <k>@ppd_else</k>
-            <v>209155</v>
+            <v>209181</v>
         </e>
         <e>
             <k>@ppd_endif</k>
-            <v>1197043</v>
+            <v>1197190</v>
         </e>
         <e>
             <k>@ppd_plain_include</k>
-            <v>311399</v>
+            <v>311437</v>
         </e>
         <e>
             <k>@ppd_define</k>
-            <v>2291924</v>
+            <v>2291914</v>
         </e>
         <e>
             <k>@ppd_undef</k>
-            <v>258643</v>
+            <v>258675</v>
         </e>
         <e>
             <k>@ppd_include_next</k>
@@ -1510,7 +1514,7 @@
         </e>
         <e>
             <k>@ppd_pragma</k>
-            <v>296710</v>
+            <v>296709</v>
         </e>
         <e>
             <k>@ppd_objc_import</k>
@@ -1600,7 +1604,7 @@
         </relation>
         <relation>
             <name>compilation_args</name>
-            <cardinality>652551</cardinality>
+            <cardinality>652548</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -2148,7 +2152,7 @@
                 </e>
                 <e>
                     <k>seconds</k>
-                    <v>9149</v>
+                    <v>9348</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2237,39 +2241,39 @@
                                     <v>239</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>8</b>
-                                    <v>159</v>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>119</v>
                                 </b>
                                 <b>
                                     <a>8</a>
-                                    <b>10</b>
-                                    <v>119</v>
+                                    <b>9</b>
+                                    <v>79</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
+                                    <a>9</a>
                                     <b>11</b>
                                     <v>159</v>
                                 </b>
                                 <b>
                                     <a>11</a>
-                                    <b>15</b>
+                                    <b>13</b>
                                     <v>159</v>
                                 </b>
                                 <b>
-                                    <a>17</a>
-                                    <b>19</b>
+                                    <a>14</a>
+                                    <b>17</b>
                                     <v>159</v>
                                 </b>
                                 <b>
-                                    <a>20</a>
-                                    <b>44</b>
+                                    <a>18</a>
+                                    <b>22</b>
                                     <v>159</v>
                                 </b>
                                 <b>
-                                    <a>50</a>
-                                    <b>92</b>
-                                    <v>79</v>
+                                    <a>25</a>
+                                    <b>91</b>
+                                    <v>159</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2337,37 +2341,37 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1478</v>
+                                    <v>1358</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>279</v>
+                                    <v>399</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>239</v>
+                                    <v>279</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>479</v>
+                                    <v>319</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>39</v>
+                                    <v>159</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>279</v>
+                                    <v>239</v>
                                 </b>
                                 <b>
                                     <a>9</a>
-                                    <b>24</b>
-                                    <v>239</v>
+                                    <b>23</b>
+                                    <v>279</v>
                                 </b>
                                 <b>
                                     <a>25</a>
@@ -2420,21 +2424,16 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>39</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>39</v>
+                                    <v>79</v>
                                 </b>
                                 <b>
-                                    <a>124</a>
-                                    <b>125</b>
+                                    <a>138</a>
+                                    <b>139</b>
                                     <v>39</v>
                                 </b>
                                 <b>
-                                    <a>129</a>
-                                    <b>130</b>
+                                    <a>144</a>
+                                    <b>145</b>
                                     <v>39</v>
                                 </b>
                             </bs>
@@ -2451,27 +2450,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4394</v>
+                                    <v>4434</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1757</v>
+                                    <v>2437</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1518</v>
+                                    <v>1158</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>998</v>
+                                    <v>679</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>46</b>
-                                    <v>479</v>
+                                    <v>639</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2492,27 +2491,27 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1478</v>
+                                    <v>2037</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1478</v>
+                                    <v>998</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>799</v>
+                                    <v>918</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>6</b>
-                                    <v>559</v>
+                                    <b>7</b>
+                                    <v>759</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>75</b>
-                                    <v>719</v>
+                                    <a>7</a>
+                                    <b>74</b>
+                                    <v>519</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2528,12 +2527,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7910</v>
+                                    <v>7191</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1238</v>
+                                    <v>2157</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2877,7 +2876,7 @@
                 </e>
                 <e>
                     <k>cpu_seconds</k>
-                    <v>7100</v>
+                    <v>7145</v>
                 </e>
                 <e>
                     <k>elapsed_seconds</k>
@@ -2927,22 +2926,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5655</v>
+                                    <v>5757</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>857</v>
+                                    <v>903</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>7</b>
-                                    <v>553</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>13</b>
-                                    <v>33</v>
+                                    <b>20</b>
+                                    <v>485</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2958,12 +2952,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6400</v>
+                                    <v>6524</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>699</v>
+                                    <v>620</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2982,8 +2976,8 @@
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>5</b>
+                                    <a>6</a>
+                                    <b>7</b>
                                     <v>11</v>
                                 </b>
                                 <b>
@@ -2991,10 +2985,15 @@
                                     <b>9</b>
                                     <v>11</v>
                                 </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>11</v>
+                                </b>
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>22</v>
+                                    <v>11</v>
                                 </b>
                                 <b>
                                     <a>51</a>
@@ -3002,23 +3001,23 @@
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>159</a>
-                                    <b>160</b>
+                                    <a>164</a>
+                                    <b>165</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>177</a>
-                                    <b>178</b>
+                                    <a>171</a>
+                                    <b>172</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>185</a>
-                                    <b>186</b>
+                                    <a>191</a>
+                                    <b>192</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>247</a>
-                                    <b>248</b>
+                                    <a>243</a>
+                                    <b>244</b>
                                     <v>11</v>
                                 </b>
                             </bs>
@@ -3038,8 +3037,8 @@
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>5</b>
+                                    <a>6</a>
+                                    <b>7</b>
                                     <v>11</v>
                                 </b>
                                 <b>
@@ -3048,8 +3047,8 @@
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>12</a>
-                                    <b>13</b>
+                                    <a>10</a>
+                                    <b>11</b>
                                     <v>11</v>
                                 </b>
                                 <b>
@@ -3063,23 +3062,23 @@
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>112</a>
-                                    <b>113</b>
+                                    <a>121</a>
+                                    <b>122</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>124</a>
-                                    <b>125</b>
+                                    <a>123</a>
+                                    <b>124</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>145</a>
-                                    <b>146</b>
+                                    <a>138</a>
+                                    <b>139</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>218</a>
-                                    <b>219</b>
+                                    <a>214</a>
+                                    <b>215</b>
                                     <v>11</v>
                                 </b>
                             </bs>
@@ -4852,31 +4851,31 @@
         </relation>
         <relation>
             <name>locations_default</name>
-            <cardinality>29765023</cardinality>
+            <cardinality>29768202</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>29765023</v>
+                    <v>29768202</v>
                 </e>
                 <e>
                     <k>container</k>
-                    <v>123252</v>
+                    <v>123267</v>
                 </e>
                 <e>
                     <k>startLine</k>
-                    <v>2095293</v>
+                    <v>2095549</v>
                 </e>
                 <e>
                     <k>startColumn</k>
-                    <v>36882</v>
+                    <v>36886</v>
                 </e>
                 <e>
                     <k>endLine</k>
-                    <v>2099495</v>
+                    <v>2099752</v>
                 </e>
                 <e>
                     <k>endColumn</k>
-                    <v>48087</v>
+                    <v>48093</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -4890,7 +4889,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29765023</v>
+                                    <v>29768202</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4906,7 +4905,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29765023</v>
+                                    <v>29768202</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4922,7 +4921,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29765023</v>
+                                    <v>29768202</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4938,7 +4937,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29765023</v>
+                                    <v>29768202</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4954,7 +4953,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29765023</v>
+                                    <v>29768202</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4970,67 +4969,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>11</b>
-                                    <v>9804</v>
+                                    <v>9805</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>18</b>
-                                    <v>10271</v>
+                                    <v>10272</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>30</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>30</a>
                                     <b>42</b>
-                                    <v>9804</v>
+                                    <v>9805</v>
                                 </b>
                                 <b>
                                     <a>43</a>
                                     <b>61</b>
-                                    <v>9804</v>
+                                    <v>9805</v>
                                 </b>
                                 <b>
                                     <a>61</a>
                                     <b>79</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>80</a>
                                     <b>106</b>
-                                    <v>9804</v>
+                                    <v>9805</v>
                                 </b>
                                 <b>
                                     <a>108</a>
                                     <b>149</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>149</a>
                                     <b>199</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>206</a>
                                     <b>291</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>304</a>
                                     <b>469</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>482</a>
                                     <b>850</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>936</a>
                                     <b>2380</b>
-                                    <v>8403</v>
+                                    <v>8404</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5046,67 +5045,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>8</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>13</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>20</b>
-                                    <v>9804</v>
+                                    <v>9805</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>32</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>32</a>
                                     <b>43</b>
-                                    <v>9804</v>
+                                    <v>9805</v>
                                 </b>
                                 <b>
                                     <a>44</a>
                                     <b>61</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>62</a>
                                     <b>72</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>73</a>
                                     <b>93</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>97</a>
                                     <b>128</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>128</a>
                                     <b>180</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>180</a>
                                     <b>267</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>277</a>
                                     <b>414</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>439</a>
                                     <b>1465</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>1557</a>
@@ -5127,67 +5126,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>4</b>
-                                    <v>8870</v>
+                                    <v>8871</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>7936</v>
+                                    <v>7937</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>7469</v>
+                                    <v>7470</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>11204</v>
+                                    <v>11206</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>10</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>15</b>
-                                    <v>10737</v>
+                                    <v>10739</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>23</b>
-                                    <v>9804</v>
+                                    <v>9805</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>28</b>
-                                    <v>11204</v>
+                                    <v>11206</v>
                                 </b>
                                 <b>
                                     <a>28</a>
                                     <b>34</b>
-                                    <v>9804</v>
+                                    <v>9805</v>
                                 </b>
                                 <b>
                                     <a>34</a>
                                     <b>44</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>44</a>
                                     <b>55</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>55</a>
                                     <b>66</b>
-                                    <v>9804</v>
+                                    <v>9805</v>
                                 </b>
                                 <b>
                                     <a>66</a>
                                     <b>77</b>
-                                    <v>8403</v>
+                                    <v>8404</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5203,67 +5202,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>8</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>13</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>20</b>
-                                    <v>9804</v>
+                                    <v>9805</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>32</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>32</a>
                                     <b>43</b>
-                                    <v>9804</v>
+                                    <v>9805</v>
                                 </b>
                                 <b>
                                     <a>43</a>
                                     <b>60</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>61</a>
                                     <b>71</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>72</a>
                                     <b>93</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>94</a>
                                     <b>127</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>128</a>
                                     <b>179</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>180</a>
                                     <b>268</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>278</a>
                                     <b>413</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>437</a>
                                     <b>1465</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>1554</a>
@@ -5284,67 +5283,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>9</b>
-                                    <v>9804</v>
+                                    <v>9805</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>13</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>18</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>26</b>
-                                    <v>10271</v>
+                                    <v>10272</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>33</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>33</a>
                                     <b>39</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>39</a>
                                     <b>47</b>
-                                    <v>10271</v>
+                                    <v>10272</v>
                                 </b>
                                 <b>
                                     <a>47</a>
                                     <b>53</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>53</a>
                                     <b>60</b>
-                                    <v>10271</v>
+                                    <v>10272</v>
                                 </b>
                                 <b>
                                     <a>60</a>
                                     <b>66</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>66</a>
                                     <b>74</b>
-                                    <v>9804</v>
+                                    <v>9805</v>
                                 </b>
                                 <b>
                                     <a>74</a>
                                     <b>78</b>
-                                    <v>9804</v>
+                                    <v>9805</v>
                                 </b>
                                 <b>
                                     <a>78</a>
                                     <b>90</b>
-                                    <v>7002</v>
+                                    <v>7003</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5360,52 +5359,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>583115</v>
+                                    <v>583186</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>314200</v>
+                                    <v>314239</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>195616</v>
+                                    <v>195640</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>162002</v>
+                                    <v>162022</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>183011</v>
+                                    <v>183033</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>16</b>
-                                    <v>162936</v>
+                                    <v>162956</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>25</b>
-                                    <v>169005</v>
+                                    <v>169026</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>46</b>
-                                    <v>161068</v>
+                                    <v>161088</v>
                                 </b>
                                 <b>
                                     <a>46</a>
                                     <b>169</b>
-                                    <v>157333</v>
+                                    <v>157353</v>
                                 </b>
                                 <b>
                                     <a>169</a>
                                     <b>265</b>
-                                    <v>7002</v>
+                                    <v>7003</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5421,42 +5420,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>871171</v>
+                                    <v>871278</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>273583</v>
+                                    <v>273616</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>193749</v>
+                                    <v>193773</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>173674</v>
+                                    <v>173695</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>13</b>
-                                    <v>188146</v>
+                                    <v>188169</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>20</b>
-                                    <v>161068</v>
+                                    <v>161088</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>51</b>
-                                    <v>159668</v>
+                                    <v>159687</v>
                                 </b>
                                 <b>
                                     <a>51</a>
                                     <b>265</b>
-                                    <v>74231</v>
+                                    <v>74240</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5472,47 +5471,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>612060</v>
+                                    <v>612135</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>313266</v>
+                                    <v>313305</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>198417</v>
+                                    <v>198442</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>183011</v>
+                                    <v>183033</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>173207</v>
+                                    <v>173228</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>13</b>
-                                    <v>163402</v>
+                                    <v>163423</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>19</b>
-                                    <v>174607</v>
+                                    <v>174629</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>29</b>
-                                    <v>164803</v>
+                                    <v>164823</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>52</b>
-                                    <v>112514</v>
+                                    <v>112528</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5528,22 +5527,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1531786</v>
+                                    <v>1531974</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>348748</v>
+                                    <v>348791</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>162002</v>
+                                    <v>162022</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>16</b>
-                                    <v>52755</v>
+                                    <v>52762</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5559,47 +5558,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>587783</v>
+                                    <v>587855</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>316068</v>
+                                    <v>316106</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>197484</v>
+                                    <v>197508</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>168538</v>
+                                    <v>168559</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>158267</v>
+                                    <v>158286</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>14</b>
-                                    <v>170872</v>
+                                    <v>170893</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>21</b>
-                                    <v>175074</v>
+                                    <v>175096</v>
                                 </b>
                                 <b>
                                     <a>21</a>
                                     <b>32</b>
-                                    <v>162469</v>
+                                    <v>162489</v>
                                 </b>
                                 <b>
                                     <a>32</a>
                                     <b>63</b>
-                                    <v>157800</v>
+                                    <v>157819</v>
                                 </b>
                                 <b>
                                     <a>64</a>
@@ -6015,52 +6014,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>593386</v>
+                                    <v>593459</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>306263</v>
+                                    <v>306301</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>198417</v>
+                                    <v>198442</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>159668</v>
+                                    <v>159687</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>182544</v>
+                                    <v>182566</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>16</b>
-                                    <v>162002</v>
+                                    <v>162022</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>25</b>
-                                    <v>171339</v>
+                                    <v>171360</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>46</b>
-                                    <v>158734</v>
+                                    <v>158753</v>
                                 </b>
                                 <b>
                                     <a>46</a>
                                     <b>161</b>
-                                    <v>158267</v>
+                                    <v>158286</v>
                                 </b>
                                 <b>
                                     <a>162</a>
                                     <b>265</b>
-                                    <v>8870</v>
+                                    <v>8871</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6076,47 +6075,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>886577</v>
+                                    <v>886686</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>260044</v>
+                                    <v>260076</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>125120</v>
+                                    <v>125135</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>140993</v>
+                                    <v>141010</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>184878</v>
+                                    <v>184901</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>15</b>
-                                    <v>168538</v>
+                                    <v>168559</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>26</b>
-                                    <v>163402</v>
+                                    <v>163423</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>120</b>
-                                    <v>158267</v>
+                                    <v>158286</v>
                                 </b>
                                 <b>
                                     <a>121</a>
                                     <b>265</b>
-                                    <v>11671</v>
+                                    <v>11673</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6132,22 +6131,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1529452</v>
+                                    <v>1529639</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>341745</v>
+                                    <v>341787</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>170872</v>
+                                    <v>170893</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>10</b>
-                                    <v>57424</v>
+                                    <v>57431</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6163,47 +6162,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>623265</v>
+                                    <v>623342</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>303462</v>
+                                    <v>303499</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>201685</v>
+                                    <v>201710</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>183945</v>
+                                    <v>183967</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>169939</v>
+                                    <v>169959</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>13</b>
-                                    <v>166671</v>
+                                    <v>166691</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>19</b>
-                                    <v>175074</v>
+                                    <v>175096</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>29</b>
-                                    <v>161068</v>
+                                    <v>161088</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>52</b>
-                                    <v>114382</v>
+                                    <v>114396</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6219,52 +6218,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>599922</v>
+                                    <v>599995</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>306263</v>
+                                    <v>306301</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>197017</v>
+                                    <v>197041</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>169005</v>
+                                    <v>169026</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>156400</v>
+                                    <v>156419</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>14</b>
-                                    <v>169005</v>
+                                    <v>169026</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>21</b>
-                                    <v>177875</v>
+                                    <v>177897</v>
                                 </b>
                                 <b>
                                     <a>21</a>
                                     <b>32</b>
-                                    <v>162002</v>
+                                    <v>162022</v>
                                 </b>
                                 <b>
                                     <a>32</a>
                                     <b>60</b>
-                                    <v>158267</v>
+                                    <v>158286</v>
                                 </b>
                                 <b>
                                     <a>60</a>
                                     <b>65</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6280,62 +6279,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5135</v>
+                                    <v>5136</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>186</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>193</a>
                                     <b>288</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>294</a>
                                     <b>495</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>503</a>
-                                    <b>555</b>
-                                    <v>3734</v>
+                                    <b>554</b>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>561</a>
                                     <b>633</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>640</a>
                                     <b>758</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>758</a>
                                     <b>869</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>875</a>
                                     <b>1074</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>1074</a>
                                     <b>1281</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>1289</a>
                                     <b>1590</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>1685</a>
@@ -6356,62 +6355,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5602</v>
+                                    <v>5603</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>70</a>
                                     <b>100</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>100</a>
                                     <b>111</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>112</a>
                                     <b>122</b>
-                                    <v>4201</v>
+                                    <v>4202</v>
                                 </b>
                                 <b>
                                     <a>122</a>
                                     <b>140</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>143</a>
                                     <b>153</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>153</a>
                                     <b>161</b>
-                                    <v>4201</v>
+                                    <v>4202</v>
                                 </b>
                                 <b>
                                     <a>161</a>
                                     <b>173</b>
-                                    <v>4201</v>
+                                    <v>4202</v>
                                 </b>
                                 <b>
                                     <a>173</a>
                                     <b>178</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>188</a>
                                     <b>265</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6427,62 +6426,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5602</v>
+                                    <v>5603</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>105</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>155</a>
                                     <b>241</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>253</a>
                                     <b>336</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>340</a>
                                     <b>426</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>434</a>
                                     <b>488</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>489</a>
                                     <b>572</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>573</a>
                                     <b>623</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>626</a>
                                     <b>696</b>
-                                    <v>4201</v>
+                                    <v>4202</v>
                                 </b>
                                 <b>
                                     <a>701</a>
                                     <b>813</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>818</a>
                                     <b>1095</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>1172</a>
@@ -6508,32 +6507,32 @@
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>4201</v>
+                                    <v>4202</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>15</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>23</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>29</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>35</b>
-                                    <v>4201</v>
+                                    <v>4202</v>
                                 </b>
                                 <b>
                                     <a>35</a>
@@ -6553,12 +6552,12 @@
                                 <b>
                                     <a>44</a>
                                     <b>46</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>46</a>
                                     <b>49</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>49</a>
@@ -6579,62 +6578,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5602</v>
+                                    <v>5603</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>156</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>159</a>
                                     <b>240</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>251</a>
                                     <b>335</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>342</a>
                                     <b>430</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>432</a>
                                     <b>490</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>490</a>
                                     <b>573</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>574</a>
                                     <b>622</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>626</a>
                                     <b>698</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>700</a>
                                     <b>798</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>811</a>
                                     <b>987</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>1096</a>
@@ -6649,11 +6648,11 @@
         </relation>
         <relation>
             <name>locations_stmt</name>
-            <cardinality>3819884</cardinality>
+            <cardinality>3819867</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3819884</v>
+                    <v>3819867</v>
                 </e>
                 <e>
                     <k>container</k>
@@ -6661,7 +6660,7 @@
                 </e>
                 <e>
                     <k>startLine</k>
-                    <v>200172</v>
+                    <v>200171</v>
                 </e>
                 <e>
                     <k>startColumn</k>
@@ -6669,7 +6668,7 @@
                 </e>
                 <e>
                     <k>endLine</k>
-                    <v>194428</v>
+                    <v>194427</v>
                 </e>
                 <e>
                     <k>endColumn</k>
@@ -6687,7 +6686,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3819884</v>
+                                    <v>3819867</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6703,7 +6702,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3819884</v>
+                                    <v>3819867</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6719,7 +6718,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3819884</v>
+                                    <v>3819867</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6735,7 +6734,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3819884</v>
+                                    <v>3819867</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6751,7 +6750,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3819884</v>
+                                    <v>3819867</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7167,7 +7166,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>14473</v>
+                                    <v>14472</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -7273,7 +7272,7 @@
                                 <b>
                                     <a>29</a>
                                     <b>36</b>
-                                    <v>16017</v>
+                                    <v>16016</v>
                                 </b>
                                 <b>
                                     <a>36</a>
@@ -7466,7 +7465,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>14720</v>
+                                    <v>14719</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -7927,7 +7926,7 @@
                                 <b>
                                     <a>15</a>
                                     <b>21</b>
-                                    <v>16120</v>
+                                    <v>16119</v>
                                 </b>
                                 <b>
                                     <a>21</a>
@@ -7942,7 +7941,7 @@
                                 <b>
                                     <a>34</a>
                                     <b>42</b>
-                                    <v>15770</v>
+                                    <v>15769</v>
                                 </b>
                                 <b>
                                     <a>42</a>
@@ -8631,11 +8630,11 @@
         </relation>
         <relation>
             <name>locations_expr</name>
-            <cardinality>13187951</cardinality>
+            <cardinality>13187892</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>13187951</v>
+                    <v>13187892</v>
                 </e>
                 <e>
                     <k>container</k>
@@ -8643,7 +8642,7 @@
                 </e>
                 <e>
                     <k>startLine</k>
-                    <v>192225</v>
+                    <v>192224</v>
                 </e>
                 <e>
                     <k>startColumn</k>
@@ -8651,7 +8650,7 @@
                 </e>
                 <e>
                     <k>endLine</k>
-                    <v>192204</v>
+                    <v>192203</v>
                 </e>
                 <e>
                     <k>endColumn</k>
@@ -8669,7 +8668,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13187951</v>
+                                    <v>13187892</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8685,7 +8684,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13187951</v>
+                                    <v>13187892</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8701,7 +8700,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13187951</v>
+                                    <v>13187892</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8717,7 +8716,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13187951</v>
+                                    <v>13187892</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8733,7 +8732,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13187951</v>
+                                    <v>13187892</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9225,7 +9224,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>23552</v>
+                                    <v>23551</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -9306,7 +9305,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>11</b>
-                                    <v>16717</v>
+                                    <v>16716</v>
                                 </b>
                                 <b>
                                     <a>11</a>
@@ -9448,7 +9447,7 @@
                                 <b>
                                     <a>43</a>
                                     <b>47</b>
-                                    <v>14720</v>
+                                    <v>14719</v>
                                 </b>
                                 <b>
                                     <a>47</a>
@@ -9458,7 +9457,7 @@
                                 <b>
                                     <a>52</a>
                                     <b>65</b>
-                                    <v>14473</v>
+                                    <v>14472</v>
                                 </b>
                                 <b>
                                     <a>65</a>
@@ -9940,7 +9939,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>23552</v>
+                                    <v>23551</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10563,23 +10562,23 @@
         </relation>
         <relation>
             <name>numlines</name>
-            <cardinality>1383789</cardinality>
+            <cardinality>1383959</cardinality>
             <columnsizes>
                 <e>
                     <k>element_id</k>
-                    <v>1376786</v>
+                    <v>1376955</v>
                 </e>
                 <e>
                     <k>num_lines</k>
-                    <v>101776</v>
+                    <v>101789</v>
                 </e>
                 <e>
                     <k>num_code</k>
-                    <v>84969</v>
+                    <v>84979</v>
                 </e>
                 <e>
                     <k>num_comment</k>
-                    <v>59758</v>
+                    <v>59766</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10593,12 +10592,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1369783</v>
+                                    <v>1369951</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7002</v>
+                                    <v>7003</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10614,7 +10613,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1370717</v>
+                                    <v>1370885</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10635,7 +10634,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1376786</v>
+                                    <v>1376955</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10651,22 +10650,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>68162</v>
+                                    <v>68170</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12138</v>
+                                    <v>12139</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>7469</v>
+                                    <v>7470</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>21</b>
-                                    <v>7936</v>
+                                    <v>7937</v>
                                 </b>
                                 <b>
                                     <a>29</a>
@@ -10687,22 +10686,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>70496</v>
+                                    <v>70505</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12138</v>
+                                    <v>12139</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>8403</v>
+                                    <v>8404</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -10723,17 +10722,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>69562</v>
+                                    <v>69571</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>14939</v>
+                                    <v>14941</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>10737</v>
+                                    <v>10739</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -10754,12 +10753,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52755</v>
+                                    <v>52762</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>14472</v>
+                                    <v>14474</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -10774,7 +10773,7 @@
                                 <b>
                                     <a>44</a>
                                     <b>922</b>
-                                    <v>4668</v>
+                                    <v>4669</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10790,12 +10789,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52755</v>
+                                    <v>52762</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>16807</v>
+                                    <v>16809</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -10826,22 +10825,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53222</v>
+                                    <v>53229</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>15873</v>
+                                    <v>15875</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>7469</v>
+                                    <v>7470</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>5135</v>
+                                    <v>5136</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -10862,27 +10861,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>34548</v>
+                                    <v>34552</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4201</v>
+                                    <v>4202</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>4668</v>
+                                    <v>4669</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>11</b>
-                                    <v>5135</v>
+                                    <v>5136</v>
                                 </b>
                                 <b>
                                     <a>17</a>
@@ -10903,27 +10902,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>34548</v>
+                                    <v>34552</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4201</v>
+                                    <v>4202</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>4668</v>
+                                    <v>4669</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>4668</v>
+                                    <v>4669</v>
                                 </b>
                                 <b>
                                     <a>10</a>
@@ -10944,27 +10943,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>34548</v>
+                                    <v>34552</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4201</v>
+                                    <v>4202</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>4668</v>
+                                    <v>4669</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>4668</v>
+                                    <v>4669</v>
                                 </b>
                                 <b>
                                     <a>10</a>
@@ -11611,15 +11610,15 @@
         </relation>
         <relation>
             <name>files</name>
-            <cardinality>123252</cardinality>
+            <cardinality>123267</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>123252</v>
+                    <v>123267</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>123252</v>
+                    <v>123267</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11633,7 +11632,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>123252</v>
+                                    <v>123267</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11649,7 +11648,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>123252</v>
+                                    <v>123267</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11659,15 +11658,15 @@
         </relation>
         <relation>
             <name>folders</name>
-            <cardinality>16340</cardinality>
+            <cardinality>16342</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>16340</v>
+                    <v>16342</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>16340</v>
+                    <v>16342</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11681,7 +11680,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16340</v>
+                                    <v>16342</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11697,7 +11696,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16340</v>
+                                    <v>16342</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11707,15 +11706,15 @@
         </relation>
         <relation>
             <name>containerparent</name>
-            <cardinality>138659</cardinality>
+            <cardinality>138676</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>16340</v>
+                    <v>16342</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>138659</v>
+                    <v>138676</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11729,7 +11728,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7469</v>
+                                    <v>7470</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11770,7 +11769,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>138659</v>
+                                    <v>138676</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11780,7 +11779,7 @@
         </relation>
         <relation>
             <name>fileannotations</name>
-            <cardinality>5129447</cardinality>
+            <cardinality>5129404</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -11792,7 +11791,7 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>54773</v>
+                    <v>54772</v>
                 </e>
                 <e>
                     <k>value</k>
@@ -11815,7 +11814,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4730</v>
+                                    <v>4729</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12066,7 +12065,7 @@
                                 <b>
                                     <a>20</a>
                                     <b>34</b>
-                                    <v>4222</v>
+                                    <v>4221</v>
                                 </b>
                                 <b>
                                     <a>34</a>
@@ -12102,7 +12101,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>54773</v>
+                                    <v>54772</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12326,12 +12325,12 @@
                                 <b>
                                     <a>39</a>
                                     <b>48</b>
-                                    <v>3612</v>
+                                    <v>3646</v>
                                 </b>
                                 <b>
                                     <a>48</a>
                                     <b>74</b>
-                                    <v>3567</v>
+                                    <v>3533</v>
                                 </b>
                                 <b>
                                     <a>74</a>
@@ -12356,15 +12355,15 @@
         </relation>
         <relation>
             <name>inmacroexpansion</name>
-            <cardinality>109779137</cardinality>
+            <cardinality>109779097</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>18027366</v>
+                    <v>18027697</v>
                 </e>
                 <e>
                     <k>inv</k>
-                    <v>2700175</v>
+                    <v>2700160</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12378,37 +12377,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>3</b>
-                                    <v>1581965</v>
+                                    <v>1582361</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>1077798</v>
+                                    <v>1077794</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>1184883</v>
+                                    <v>1184878</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>4819923</v>
+                                    <v>4819904</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>6385959</v>
+                                    <v>6385933</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>2605253</v>
+                                    <v>2605242</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>21</b>
-                                    <v>371583</v>
+                                    <v>371581</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12424,7 +12423,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>378428</v>
+                                    <v>378424</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12434,22 +12433,22 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>351515</v>
+                                    <v>351513</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>200660</v>
+                                    <v>200658</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>207152</v>
+                                    <v>207151</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>241888</v>
+                                    <v>241887</v>
                                 </b>
                                 <b>
                                     <a>9</a>
@@ -12459,17 +12458,17 @@
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>325486</v>
+                                    <v>325485</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>337</b>
-                                    <v>224849</v>
+                                    <v>224845</v>
                                 </b>
                                 <b>
                                     <a>339</a>
                                     <b>423</b>
-                                    <v>206353</v>
+                                    <v>206352</v>
                                 </b>
                                 <b>
                                     <a>423</a>
@@ -12484,15 +12483,15 @@
         </relation>
         <relation>
             <name>affectedbymacroexpansion</name>
-            <cardinality>35689082</cardinality>
+            <cardinality>35689256</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5156745</v>
+                    <v>5156949</v>
                 </e>
                 <e>
                     <k>inv</k>
-                    <v>2784776</v>
+                    <v>2784762</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12506,32 +12505,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2815933</v>
+                                    <v>2816079</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>560132</v>
+                                    <v>560184</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>264906</v>
+                                    <v>264908</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>565794</v>
+                                    <v>565803</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>12</b>
-                                    <v>391903</v>
+                                    <v>391901</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>50</b>
-                                    <v>407401</v>
+                                    <v>407399</v>
                                 </b>
                                 <b>
                                     <a>50</a>
@@ -12552,32 +12551,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>4</b>
-                                    <v>229120</v>
+                                    <v>229116</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>231788</v>
+                                    <v>231720</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>220478</v>
+                                    <v>220491</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>12</b>
-                                    <v>251087</v>
+                                    <v>251120</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>13</b>
-                                    <v>333978</v>
+                                    <v>333985</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>165588</v>
+                                    <v>165593</v>
                                 </b>
                                 <b>
                                     <a>14</a>
@@ -12587,7 +12586,7 @@
                                 <b>
                                     <a>15</a>
                                     <b>16</b>
-                                    <v>121843</v>
+                                    <v>121842</v>
                                 </b>
                                 <b>
                                     <a>16</a>
@@ -12597,7 +12596,7 @@
                                 <b>
                                     <a>17</a>
                                     <b>18</b>
-                                    <v>146940</v>
+                                    <v>146942</v>
                                 </b>
                                 <b>
                                     <a>18</a>
@@ -12607,7 +12606,7 @@
                                 <b>
                                     <a>20</a>
                                     <b>25</b>
-                                    <v>208979</v>
+                                    <v>208978</v>
                                 </b>
                                 <b>
                                     <a>25</a>
@@ -12622,19 +12621,19 @@
         </relation>
         <relation>
             <name>macroinvocations</name>
-            <cardinality>33491157</cardinality>
+            <cardinality>33490802</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>33491157</v>
+                    <v>33490802</v>
                 </e>
                 <e>
                     <k>macro_id</k>
-                    <v>79484</v>
+                    <v>79483</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>760390</v>
+                    <v>760382</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -12652,7 +12651,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33491157</v>
+                                    <v>33490802</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12668,7 +12667,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33491157</v>
+                                    <v>33490802</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12684,7 +12683,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33491157</v>
+                                    <v>33490802</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12766,7 +12765,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>42468</v>
+                                    <v>42467</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12781,7 +12780,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>6841</v>
+                                    <v>6840</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -12812,7 +12811,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73749</v>
+                                    <v>73748</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12833,22 +12832,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>281226</v>
+                                    <v>281223</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>169659</v>
+                                    <v>169657</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>70735</v>
+                                    <v>70734</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>60327</v>
+                                    <v>60326</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -12884,12 +12883,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>714219</v>
+                                    <v>714211</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>350</b>
-                                    <v>46171</v>
+                                    <v>46170</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12905,7 +12904,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>760390</v>
+                                    <v>760382</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12978,15 +12977,15 @@
         </relation>
         <relation>
             <name>macroparent</name>
-            <cardinality>29950856</cardinality>
+            <cardinality>29950538</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>29950856</v>
+                    <v>29950538</v>
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>23287102</v>
+                    <v>23286856</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13000,7 +12999,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29950856</v>
+                                    <v>29950538</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13016,17 +13015,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17992872</v>
+                                    <v>17992681</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4459570</v>
+                                    <v>4459523</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>88</b>
-                                    <v>834659</v>
+                                    <v>834650</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13036,15 +13035,15 @@
         </relation>
         <relation>
             <name>macrolocationbind</name>
-            <cardinality>4043799</cardinality>
+            <cardinality>4043781</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2831150</v>
+                    <v>2831137</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2021069</v>
+                    <v>2021060</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13058,22 +13057,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2229922</v>
+                                    <v>2229912</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>341125</v>
+                                    <v>341123</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>230525</v>
+                                    <v>230524</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>57</b>
-                                    <v>29577</v>
+                                    <v>29576</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13089,12 +13088,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1611024</v>
+                                    <v>1611017</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>177682</v>
+                                    <v>177681</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -13104,7 +13103,7 @@
                                 <b>
                                     <a>8</a>
                                     <b>723</b>
-                                    <v>75493</v>
+                                    <v>75492</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13114,11 +13113,11 @@
         </relation>
         <relation>
             <name>macro_argument_unexpanded</name>
-            <cardinality>84549814</cardinality>
+            <cardinality>84548918</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>26214874</v>
+                    <v>26214596</v>
                 </e>
                 <e>
                     <k>argument_index</k>
@@ -13126,7 +13125,7 @@
                 </e>
                 <e>
                     <k>text</k>
-                    <v>318310</v>
+                    <v>318306</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13140,22 +13139,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7432497</v>
+                                    <v>7432418</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10674075</v>
+                                    <v>10673962</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6139354</v>
+                                    <v>6139289</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1968946</v>
+                                    <v>1968925</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13171,22 +13170,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7502657</v>
+                                    <v>7502578</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10820626</v>
+                                    <v>10820511</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5973025</v>
+                                    <v>5972962</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1918564</v>
+                                    <v>1918544</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13254,12 +13253,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>35074</v>
+                                    <v>35073</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>61264</v>
+                                    <v>61263</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -13269,12 +13268,12 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>45087</v>
+                                    <v>45086</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>23932</v>
+                                    <v>23931</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -13289,7 +13288,7 @@
                                 <b>
                                     <a>16</a>
                                     <b>23</b>
-                                    <v>24982</v>
+                                    <v>24981</v>
                                 </b>
                                 <b>
                                     <a>23</a>
@@ -13320,7 +13319,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>230201</v>
+                                    <v>230198</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13330,7 +13329,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>10284</v>
+                                    <v>10283</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13340,11 +13339,11 @@
         </relation>
         <relation>
             <name>macro_argument_expanded</name>
-            <cardinality>84549814</cardinality>
+            <cardinality>84548918</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>26214874</v>
+                    <v>26214596</v>
                 </e>
                 <e>
                     <k>argument_index</k>
@@ -13352,7 +13351,7 @@
                 </e>
                 <e>
                     <k>text</k>
-                    <v>192902</v>
+                    <v>192900</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13366,22 +13365,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7432497</v>
+                                    <v>7432418</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10674075</v>
+                                    <v>10673962</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6139354</v>
+                                    <v>6139289</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1968946</v>
+                                    <v>1968925</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13397,22 +13396,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10688841</v>
+                                    <v>10688727</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9201903</v>
+                                    <v>9201805</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5208300</v>
+                                    <v>5208245</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>1115829</v>
+                                    <v>1115817</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13551,7 +13550,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>97625</v>
+                                    <v>97624</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13571,15 +13570,15 @@
         </relation>
         <relation>
             <name>functions</name>
-            <cardinality>4179381</cardinality>
+            <cardinality>4179893</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4179381</v>
+                    <v>4179893</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1895474</v>
+                    <v>1895706</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -13597,7 +13596,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4179381</v>
+                                    <v>4179893</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13613,7 +13612,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4179381</v>
+                                    <v>4179893</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13629,22 +13628,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1498172</v>
+                                    <v>1498355</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>153131</v>
+                                    <v>153150</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>142860</v>
+                                    <v>142878</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>952</b>
-                                    <v>101309</v>
+                                    <v>101322</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13660,7 +13659,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1895007</v>
+                                    <v>1895240</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13762,15 +13761,15 @@
         </relation>
         <relation>
             <name>function_entry_point</name>
-            <cardinality>1151757</cardinality>
+            <cardinality>1151752</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1141953</v>
+                    <v>1141948</v>
                 </e>
                 <e>
                     <k>entry_point</k>
-                    <v>1151757</v>
+                    <v>1151752</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13784,7 +13783,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1132149</v>
+                                    <v>1132144</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13805,7 +13804,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1151757</v>
+                                    <v>1151752</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13815,15 +13814,15 @@
         </relation>
         <relation>
             <name>function_return_type</name>
-            <cardinality>4184517</cardinality>
+            <cardinality>4185029</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4179381</v>
+                    <v>4179893</v>
                 </e>
                 <e>
                     <k>return_type</k>
-                    <v>817948</v>
+                    <v>818048</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13837,12 +13836,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4174246</v>
+                                    <v>4174757</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5135</v>
+                                    <v>5136</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13858,22 +13857,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>506082</v>
+                                    <v>506144</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>211490</v>
+                                    <v>211516</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>66294</v>
+                                    <v>66303</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>2231</b>
-                                    <v>34081</v>
+                                    <v>34085</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14153,44 +14152,44 @@
         </relation>
         <relation>
             <name>purefunctions</name>
-            <cardinality>100952</cardinality>
+            <cardinality>100951</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>100952</v>
+                    <v>100951</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_deleted</name>
-            <cardinality>96174</cardinality>
+            <cardinality>96186</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>96174</v>
+                    <v>96186</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_defaulted</name>
-            <cardinality>73764</cardinality>
+            <cardinality>73773</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>73764</v>
+                    <v>73773</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_prototyped</name>
-            <cardinality>4087409</cardinality>
+            <cardinality>4087910</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4087409</v>
+                    <v>4087910</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -14270,11 +14269,11 @@
         </relation>
         <relation>
             <name>member_function_this_type</name>
-            <cardinality>536525</cardinality>
+            <cardinality>536522</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>536525</v>
+                    <v>536522</v>
                 </e>
                 <e>
                     <k>this_type</k>
@@ -14292,7 +14291,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>536525</v>
+                                    <v>536522</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14343,27 +14342,27 @@
         </relation>
         <relation>
             <name>fun_decls</name>
-            <cardinality>4548672</cardinality>
+            <cardinality>4549229</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4543537</v>
+                    <v>4544093</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>4035587</v>
+                    <v>4036081</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>816548</v>
+                    <v>816648</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1797899</v>
+                    <v>1798120</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>3370770</v>
+                    <v>3371183</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14377,7 +14376,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4543537</v>
+                                    <v>4544093</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14393,12 +14392,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4538401</v>
+                                    <v>4538957</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5135</v>
+                                    <v>5136</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14414,7 +14413,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4543537</v>
+                                    <v>4544093</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14430,7 +14429,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4543537</v>
+                                    <v>4544093</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14446,17 +14445,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3606537</v>
+                                    <v>3606979</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>356218</v>
+                                    <v>356262</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>72831</v>
+                                    <v>72839</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14472,12 +14471,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3995903</v>
+                                    <v>3996393</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>39683</v>
+                                    <v>39688</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14493,7 +14492,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4035587</v>
+                                    <v>4036081</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14509,17 +14508,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3663028</v>
+                                    <v>3663477</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>311866</v>
+                                    <v>311904</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>60692</v>
+                                    <v>60699</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14535,22 +14534,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>431383</v>
+                                    <v>431436</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>274050</v>
+                                    <v>274083</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>63493</v>
+                                    <v>63501</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>2476</b>
-                                    <v>47620</v>
+                                    <v>47626</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14566,22 +14565,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>515419</v>
+                                    <v>515482</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>203086</v>
+                                    <v>203111</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>63026</v>
+                                    <v>63034</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>2192</b>
-                                    <v>35014</v>
+                                    <v>35019</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14597,17 +14596,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>690027</v>
+                                    <v>690112</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>67228</v>
+                                    <v>67236</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>773</b>
-                                    <v>59291</v>
+                                    <v>59299</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14623,22 +14622,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>595253</v>
+                                    <v>595326</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>121385</v>
+                                    <v>121399</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>63493</v>
+                                    <v>63501</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>1959</b>
-                                    <v>36415</v>
+                                    <v>36419</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14654,27 +14653,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1228323</v>
+                                    <v>1228474</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>267047</v>
+                                    <v>267079</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>77966</v>
+                                    <v>77976</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>146128</v>
+                                    <v>146146</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>986</b>
-                                    <v>78433</v>
+                                    <v>78443</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14690,22 +14689,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1407600</v>
+                                    <v>1407772</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>152198</v>
+                                    <v>152216</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>136791</v>
+                                    <v>136808</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>936</b>
-                                    <v>101309</v>
+                                    <v>101322</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14721,17 +14720,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1579406</v>
+                                    <v>1579600</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>134924</v>
+                                    <v>134940</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>562</b>
-                                    <v>83568</v>
+                                    <v>83579</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14747,27 +14746,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1236260</v>
+                                    <v>1236411</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>293191</v>
+                                    <v>293227</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>78900</v>
+                                    <v>78909</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>137258</v>
+                                    <v>137275</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>542</b>
-                                    <v>52288</v>
+                                    <v>52295</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14783,17 +14782,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2966464</v>
+                                    <v>2966828</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>277785</v>
+                                    <v>277819</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>55</b>
-                                    <v>126520</v>
+                                    <v>126536</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14809,17 +14808,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3033693</v>
+                                    <v>3034065</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>244170</v>
+                                    <v>244200</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>55</b>
-                                    <v>92906</v>
+                                    <v>92917</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14835,12 +14834,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3207367</v>
+                                    <v>3207760</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>18</b>
-                                    <v>163402</v>
+                                    <v>163423</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14856,12 +14855,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3232578</v>
+                                    <v>3232974</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>13</b>
-                                    <v>138192</v>
+                                    <v>138209</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14871,22 +14870,22 @@
         </relation>
         <relation>
             <name>fun_def</name>
-            <cardinality>1888938</cardinality>
+            <cardinality>1889170</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1888938</v>
+                    <v>1889170</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>fun_specialized</name>
-            <cardinality>26144</cardinality>
+            <cardinality>26147</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>26144</v>
+                    <v>26147</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -14904,11 +14903,11 @@
         </relation>
         <relation>
             <name>fun_decl_specifiers</name>
-            <cardinality>2906705</cardinality>
+            <cardinality>2907062</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1689587</v>
+                    <v>1689793</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -14926,17 +14925,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>491142</v>
+                                    <v>491202</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1179769</v>
+                                    <v>1179914</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>18674</v>
+                                    <v>18676</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15108,22 +15107,22 @@
         </relation>
         <relation>
             <name>fun_decl_empty_throws</name>
-            <cardinality>1472027</cardinality>
+            <cardinality>1472207</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>1472027</v>
+                    <v>1472207</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>fun_decl_noexcept</name>
-            <cardinality>61667</cardinality>
+            <cardinality>61666</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>61667</v>
+                    <v>61666</v>
                 </e>
                 <e>
                     <k>constant</k>
@@ -15141,7 +15140,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>61667</v>
+                                    <v>61666</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15172,11 +15171,11 @@
         </relation>
         <relation>
             <name>fun_decl_empty_noexcept</name>
-            <cardinality>863234</cardinality>
+            <cardinality>863340</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>863234</v>
+                    <v>863340</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -15281,19 +15280,19 @@
         </relation>
         <relation>
             <name>param_decl_bind</name>
-            <cardinality>6995048</cardinality>
+            <cardinality>6995905</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6995048</v>
+                    <v>6995905</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>7936</v>
+                    <v>7937</v>
                 </e>
                 <e>
                     <k>fun_decl</k>
-                    <v>3835301</v>
+                    <v>3835771</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -15307,7 +15306,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6995048</v>
+                                    <v>6995905</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15323,7 +15322,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6995048</v>
+                                    <v>6995905</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15501,22 +15500,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1973908</v>
+                                    <v>1974150</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1061652</v>
+                                    <v>1061782</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>502814</v>
+                                    <v>502875</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>290857</v>
+                                    <v>290892</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -15537,22 +15536,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1973908</v>
+                                    <v>1974150</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1061652</v>
+                                    <v>1061782</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>502814</v>
+                                    <v>502875</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>290857</v>
+                                    <v>290892</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -15567,27 +15566,27 @@
         </relation>
         <relation>
             <name>var_decls</name>
-            <cardinality>8110391</cardinality>
+            <cardinality>8111384</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>8039427</v>
+                    <v>8040412</v>
                 </e>
                 <e>
                     <k>variable</k>
-                    <v>7027262</v>
+                    <v>7028123</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>2043471</v>
+                    <v>2043721</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>667617</v>
+                    <v>667699</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5311998</v>
+                    <v>5312648</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -15601,7 +15600,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8039427</v>
+                                    <v>8040412</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15617,12 +15616,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7971265</v>
+                                    <v>7972241</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>68162</v>
+                                    <v>68170</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15638,7 +15637,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8039427</v>
+                                    <v>8040412</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15654,7 +15653,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8036626</v>
+                                    <v>8037610</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15675,17 +15674,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6175232</v>
+                                    <v>6175989</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>698431</v>
+                                    <v>698516</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>153598</v>
+                                    <v>153617</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15701,12 +15700,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6855922</v>
+                                    <v>6856762</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>171339</v>
+                                    <v>171360</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15722,12 +15721,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6911946</v>
+                                    <v>6912793</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>115315</v>
+                                    <v>115329</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15743,12 +15742,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6481963</v>
+                                    <v>6482757</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>542964</v>
+                                    <v>543031</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -15769,27 +15768,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1165763</v>
+                                    <v>1165906</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>477136</v>
+                                    <v>477195</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>94773</v>
+                                    <v>94785</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>184878</v>
+                                    <v>184901</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>762</b>
-                                    <v>120918</v>
+                                    <v>120933</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15805,22 +15804,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1299287</v>
+                                    <v>1299446</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>452392</v>
+                                    <v>452448</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>155933</v>
+                                    <v>155952</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>724</b>
-                                    <v>135857</v>
+                                    <v>135874</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15836,17 +15835,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1539256</v>
+                                    <v>1539444</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>383296</v>
+                                    <v>383343</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>128</b>
-                                    <v>120918</v>
+                                    <v>120933</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15862,22 +15861,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1365582</v>
+                                    <v>1365749</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>404305</v>
+                                    <v>404355</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>173207</v>
+                                    <v>173228</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>592</b>
-                                    <v>100376</v>
+                                    <v>100388</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15893,37 +15892,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>341278</v>
+                                    <v>341320</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>86837</v>
+                                    <v>86847</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>48554</v>
+                                    <v>48559</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>51822</v>
+                                    <v>51828</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>12</b>
-                                    <v>52288</v>
+                                    <v>52295</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>33</b>
-                                    <v>50421</v>
+                                    <v>50427</v>
                                 </b>
                                 <b>
                                     <a>34</a>
                                     <b>2384</b>
-                                    <v>36415</v>
+                                    <v>36419</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15939,37 +15938,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>368823</v>
+                                    <v>368869</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>77966</v>
+                                    <v>77976</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>45285</v>
+                                    <v>45291</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>49487</v>
+                                    <v>49493</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>14</b>
-                                    <v>53222</v>
+                                    <v>53229</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>56</b>
-                                    <v>50888</v>
+                                    <v>50894</v>
                                 </b>
                                 <b>
                                     <a>56</a>
                                     <b>2301</b>
-                                    <v>21942</v>
+                                    <v>21945</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15985,27 +15984,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>457061</v>
+                                    <v>457117</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>93840</v>
+                                    <v>93851</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>46686</v>
+                                    <v>46692</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>19</b>
-                                    <v>50888</v>
+                                    <v>50894</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>1182</b>
-                                    <v>19141</v>
+                                    <v>19143</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16021,32 +16020,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>379094</v>
+                                    <v>379141</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>90571</v>
+                                    <v>90583</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>59758</v>
+                                    <v>59766</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>9</b>
-                                    <v>51355</v>
+                                    <v>51361</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>21</b>
-                                    <v>50421</v>
+                                    <v>50427</v>
                                 </b>
                                 <b>
                                     <a>21</a>
                                     <b>1010</b>
-                                    <v>36415</v>
+                                    <v>36419</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16062,17 +16061,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4496383</v>
+                                    <v>4496934</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>531760</v>
+                                    <v>531825</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>896</b>
-                                    <v>283854</v>
+                                    <v>283889</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16088,17 +16087,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4885749</v>
+                                    <v>4886348</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>17</b>
-                                    <v>415510</v>
+                                    <v>415561</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>892</b>
-                                    <v>10737</v>
+                                    <v>10739</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16114,12 +16113,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4961848</v>
+                                    <v>4962456</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>759</b>
-                                    <v>350149</v>
+                                    <v>350192</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16135,12 +16134,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5302660</v>
+                                    <v>5303310</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>9337</v>
+                                    <v>9338</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16150,22 +16149,22 @@
         </relation>
         <relation>
             <name>var_def</name>
-            <cardinality>3994969</cardinality>
+            <cardinality>3995459</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3994969</v>
+                    <v>3995459</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>var_decl_specifiers</name>
-            <cardinality>378628</cardinality>
+            <cardinality>378674</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>378628</v>
+                    <v>378674</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -16183,7 +16182,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>378628</v>
+                                    <v>378674</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16235,19 +16234,19 @@
         </relation>
         <relation>
             <name>type_decls</name>
-            <cardinality>3283466</cardinality>
+            <cardinality>3283868</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3283466</v>
+                    <v>3283868</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>3233045</v>
+                    <v>3233441</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>3166283</v>
+                    <v>3166671</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16261,7 +16260,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3283466</v>
+                                    <v>3283868</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16277,7 +16276,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3283466</v>
+                                    <v>3283868</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16293,12 +16292,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3191493</v>
+                                    <v>3191884</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>41551</v>
+                                    <v>41556</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16314,12 +16313,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3191493</v>
+                                    <v>3191884</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>41551</v>
+                                    <v>41556</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16335,12 +16334,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3113994</v>
+                                    <v>3114375</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>20</b>
-                                    <v>52288</v>
+                                    <v>52295</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16356,12 +16355,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3113994</v>
+                                    <v>3114375</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>20</b>
-                                    <v>52288</v>
+                                    <v>52295</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16371,33 +16370,33 @@
         </relation>
         <relation>
             <name>type_def</name>
-            <cardinality>2641993</cardinality>
+            <cardinality>2642316</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2641993</v>
+                    <v>2642316</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>type_decl_top</name>
-            <cardinality>743717</cardinality>
+            <cardinality>743808</cardinality>
             <columnsizes>
                 <e>
                     <k>type_decl</k>
-                    <v>743717</v>
+                    <v>743808</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>namespace_decls</name>
-            <cardinality>311638</cardinality>
+            <cardinality>311636</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>311638</v>
+                    <v>311636</v>
                 </e>
                 <e>
                     <k>namespace_id</k>
@@ -16405,11 +16404,11 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>311638</v>
+                    <v>311636</v>
                 </e>
                 <e>
                     <k>bodylocation</k>
-                    <v>311638</v>
+                    <v>311636</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16423,7 +16422,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>311638</v>
+                                    <v>311636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16439,7 +16438,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>311638</v>
+                                    <v>311636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16455,7 +16454,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>311638</v>
+                                    <v>311636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16669,7 +16668,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>311638</v>
+                                    <v>311636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16685,7 +16684,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>311638</v>
+                                    <v>311636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16701,7 +16700,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>311638</v>
+                                    <v>311636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16717,7 +16716,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>311638</v>
+                                    <v>311636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16733,7 +16732,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>311638</v>
+                                    <v>311636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16749,7 +16748,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>311638</v>
+                                    <v>311636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16759,19 +16758,19 @@
         </relation>
         <relation>
             <name>usings</name>
-            <cardinality>369757</cardinality>
+            <cardinality>369802</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>369757</v>
+                    <v>369802</v>
                 </e>
                 <e>
                     <k>element_id</k>
-                    <v>315601</v>
+                    <v>315639</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>247905</v>
+                    <v>247936</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -16789,7 +16788,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>369757</v>
+                                    <v>369802</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16805,7 +16804,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>369757</v>
+                                    <v>369802</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16821,7 +16820,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>369757</v>
+                                    <v>369802</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16837,12 +16836,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>263312</v>
+                                    <v>263344</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>50888</v>
+                                    <v>50894</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -16863,12 +16862,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>263312</v>
+                                    <v>263344</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>50888</v>
+                                    <v>50894</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -16889,7 +16888,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>315601</v>
+                                    <v>315639</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16905,17 +16904,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>202619</v>
+                                    <v>202644</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>10737</v>
+                                    <v>10739</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>31280</v>
+                                    <v>31283</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -16936,17 +16935,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>202619</v>
+                                    <v>202644</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>10737</v>
+                                    <v>10739</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>31280</v>
+                                    <v>31283</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -16967,7 +16966,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>247905</v>
+                                    <v>247936</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17040,7 +17039,7 @@
         </relation>
         <relation>
             <name>using_container</name>
-            <cardinality>466802</cardinality>
+            <cardinality>466798</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
@@ -17048,7 +17047,7 @@
                 </e>
                 <e>
                     <k>child</k>
-                    <v>295992</v>
+                    <v>295989</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -17118,12 +17117,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>218314</v>
+                                    <v>218311</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>51725</v>
+                                    <v>51724</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -17143,15 +17142,15 @@
         </relation>
         <relation>
             <name>static_asserts</name>
-            <cardinality>134702</cardinality>
+            <cardinality>134701</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>134702</v>
+                    <v>134701</v>
                 </e>
                 <e>
                     <k>condition</k>
-                    <v>134702</v>
+                    <v>134701</v>
                 </e>
                 <e>
                     <k>message</k>
@@ -17177,7 +17176,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>134702</v>
+                                    <v>134701</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17193,7 +17192,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>134702</v>
+                                    <v>134701</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17209,7 +17208,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>134702</v>
+                                    <v>134701</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17225,7 +17224,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>134702</v>
+                                    <v>134701</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17241,7 +17240,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>134702</v>
+                                    <v>134701</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17257,7 +17256,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>134702</v>
+                                    <v>134701</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17273,7 +17272,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>134702</v>
+                                    <v>134701</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17289,7 +17288,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>134702</v>
+                                    <v>134701</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17751,23 +17750,23 @@
         </relation>
         <relation>
             <name>params</name>
-            <cardinality>6354509</cardinality>
+            <cardinality>6355287</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6190639</v>
+                    <v>6191397</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>3491688</v>
+                    <v>3492116</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>7936</v>
+                    <v>7937</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1846453</v>
+                    <v>1846680</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -17781,7 +17780,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6190639</v>
+                                    <v>6191397</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17797,7 +17796,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6190639</v>
+                                    <v>6191397</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17813,12 +17812,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6066919</v>
+                                    <v>6067663</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>123719</v>
+                                    <v>123734</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17834,22 +17833,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1867462</v>
+                                    <v>1867691</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>952872</v>
+                                    <v>952989</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>429983</v>
+                                    <v>430035</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>18</b>
-                                    <v>241369</v>
+                                    <v>241399</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17865,22 +17864,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1867462</v>
+                                    <v>1867691</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>952872</v>
+                                    <v>952989</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>429983</v>
+                                    <v>430035</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>18</b>
-                                    <v>241369</v>
+                                    <v>241399</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17896,22 +17895,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2165790</v>
+                                    <v>2166055</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>826819</v>
+                                    <v>826920</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>346414</v>
+                                    <v>346456</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>152665</v>
+                                    <v>152683</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18165,22 +18164,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1183971</v>
+                                    <v>1184116</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>406173</v>
+                                    <v>406222</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>154065</v>
+                                    <v>154084</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>518</b>
-                                    <v>102243</v>
+                                    <v>102256</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18196,22 +18195,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1404798</v>
+                                    <v>1404971</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>212423</v>
+                                    <v>212449</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>147529</v>
+                                    <v>147547</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>502</b>
-                                    <v>81701</v>
+                                    <v>81711</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18227,17 +18226,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1420205</v>
+                                    <v>1420379</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>347348</v>
+                                    <v>347390</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>13</b>
-                                    <v>78900</v>
+                                    <v>78909</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18330,19 +18329,19 @@
         </relation>
         <relation>
             <name>membervariables</name>
-            <cardinality>1056495</cardinality>
+            <cardinality>1056490</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1054697</v>
+                    <v>1054692</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>327727</v>
+                    <v>327726</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>451619</v>
+                    <v>451617</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18356,7 +18355,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1052979</v>
+                                    <v>1052974</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18377,7 +18376,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1054697</v>
+                                    <v>1054692</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18393,7 +18392,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>243029</v>
+                                    <v>243027</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18424,7 +18423,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>255254</v>
+                                    <v>255253</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18455,7 +18454,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>295326</v>
+                                    <v>295325</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18486,12 +18485,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>367839</v>
+                                    <v>367837</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>51738</v>
+                                    <v>51737</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -18506,7 +18505,7 @@
         </relation>
         <relation>
             <name>globalvariables</name>
-            <cardinality>301284</cardinality>
+            <cardinality>301286</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -18532,12 +18531,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>301268</v>
+                                    <v>301266</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8</v>
+                                    <v>10</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18574,12 +18573,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>160</v>
+                                    <v>159</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>116</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -18868,11 +18867,11 @@
         </relation>
         <relation>
             <name>autoderivation</name>
-            <cardinality>147961</cardinality>
+            <cardinality>147960</cardinality>
             <columnsizes>
                 <e>
                     <k>var</k>
-                    <v>147961</v>
+                    <v>147960</v>
                 </e>
                 <e>
                     <k>derivation_type</k>
@@ -18890,7 +18889,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>147961</v>
+                                    <v>147960</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18989,11 +18988,11 @@
         </relation>
         <relation>
             <name>enumconstants</name>
-            <cardinality>241670</cardinality>
+            <cardinality>241669</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>241670</v>
+                    <v>241669</v>
                 </e>
                 <e>
                     <k>parent</k>
@@ -19009,11 +19008,11 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>241391</v>
+                    <v>241389</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>221574</v>
+                    <v>221573</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19027,7 +19026,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241670</v>
+                                    <v>241669</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19043,7 +19042,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241670</v>
+                                    <v>241669</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19059,7 +19058,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241670</v>
+                                    <v>241669</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19075,7 +19074,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241670</v>
+                                    <v>241669</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19091,7 +19090,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241670</v>
+                                    <v>241669</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19331,7 +19330,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5833</v>
+                                    <v>5832</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -19702,7 +19701,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241111</v>
+                                    <v>241110</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19723,7 +19722,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241111</v>
+                                    <v>241110</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19744,7 +19743,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241391</v>
+                                    <v>241389</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19760,7 +19759,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241391</v>
+                                    <v>241389</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19776,7 +19775,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241111</v>
+                                    <v>241110</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19797,7 +19796,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>220815</v>
+                                    <v>220814</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19818,7 +19817,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>221574</v>
+                                    <v>221573</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19834,7 +19833,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>220815</v>
+                                    <v>220814</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19855,7 +19854,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>221574</v>
+                                    <v>221573</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19871,7 +19870,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>220815</v>
+                                    <v>220814</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19886,19 +19885,19 @@
         </relation>
         <relation>
             <name>builtintypes</name>
-            <cardinality>26144</cardinality>
+            <cardinality>26147</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>26144</v>
+                    <v>26147</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>26144</v>
+                    <v>26147</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>26144</v>
+                    <v>26147</v>
                 </e>
                 <e>
                     <k>size</k>
@@ -19924,7 +19923,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26147</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19940,7 +19939,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26147</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19956,7 +19955,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26147</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19972,7 +19971,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26147</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19988,7 +19987,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26147</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20004,7 +20003,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26147</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20020,7 +20019,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26147</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20036,7 +20035,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26147</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20052,7 +20051,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26147</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20068,7 +20067,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26147</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20084,7 +20083,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26147</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20100,7 +20099,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26147</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20116,7 +20115,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26147</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20132,7 +20131,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26147</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20148,7 +20147,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26147</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20593,15 +20592,15 @@
         </relation>
         <relation>
             <name>derivedtypes</name>
-            <cardinality>3669564</cardinality>
+            <cardinality>3670014</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3669564</v>
+                    <v>3670014</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1552795</v>
+                    <v>1552985</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -20609,7 +20608,7 @@
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>2362807</v>
+                    <v>2363096</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20623,7 +20622,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3669564</v>
+                                    <v>3670014</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20639,7 +20638,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3669564</v>
+                                    <v>3670014</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20655,7 +20654,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3669564</v>
+                                    <v>3670014</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20671,17 +20670,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1324031</v>
+                                    <v>1324193</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>120451</v>
+                                    <v>120466</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>1153</b>
-                                    <v>108312</v>
+                                    <v>108326</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20697,7 +20696,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1551861</v>
+                                    <v>1552051</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20718,17 +20717,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1324031</v>
+                                    <v>1324193</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>120451</v>
+                                    <v>120466</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>1135</b>
-                                    <v>108312</v>
+                                    <v>108326</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20867,22 +20866,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1515446</v>
+                                    <v>1515631</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>546232</v>
+                                    <v>546299</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>218493</v>
+                                    <v>218519</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>72</b>
-                                    <v>82635</v>
+                                    <v>82645</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20898,22 +20897,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1526650</v>
+                                    <v>1526837</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>538763</v>
+                                    <v>538829</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>215691</v>
+                                    <v>215718</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>72</b>
-                                    <v>81701</v>
+                                    <v>81711</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20929,22 +20928,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1519647</v>
+                                    <v>1519834</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>549967</v>
+                                    <v>550035</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>217559</v>
+                                    <v>217586</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>75632</v>
+                                    <v>75641</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20954,11 +20953,11 @@
         </relation>
         <relation>
             <name>pointerishsize</name>
-            <cardinality>2707354</cardinality>
+            <cardinality>2707685</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2707354</v>
+                    <v>2707685</v>
                 </e>
                 <e>
                     <k>size</k>
@@ -20980,7 +20979,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2707354</v>
+                                    <v>2707685</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20996,7 +20995,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2707354</v>
+                                    <v>2707685</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21070,19 +21069,19 @@
         </relation>
         <relation>
             <name>arraysizes</name>
-            <cardinality>88237</cardinality>
+            <cardinality>88248</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>88237</v>
+                    <v>88248</v>
                 </e>
                 <e>
                     <k>num_elements</k>
-                    <v>31746</v>
+                    <v>31750</v>
                 </e>
                 <e>
                     <k>bytesize</k>
-                    <v>33147</v>
+                    <v>33151</v>
                 </e>
                 <e>
                     <k>alignment</k>
@@ -21100,7 +21099,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>88237</v>
+                                    <v>88248</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21116,7 +21115,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>88237</v>
+                                    <v>88248</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21132,7 +21131,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>88237</v>
+                                    <v>88248</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21153,7 +21152,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>23810</v>
+                                    <v>23813</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -21184,7 +21183,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26611</v>
+                                    <v>26614</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21210,7 +21209,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26611</v>
+                                    <v>26614</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21241,7 +21240,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>23810</v>
+                                    <v>23813</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -21272,12 +21271,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27545</v>
+                                    <v>27548</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -21298,12 +21297,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27545</v>
+                                    <v>27548</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4668</v>
+                                    <v>4669</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -21406,15 +21405,15 @@
         </relation>
         <relation>
             <name>typedefbase</name>
-            <cardinality>1686117</cardinality>
+            <cardinality>1686099</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1686117</v>
+                    <v>1686099</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>793489</v>
+                    <v>793481</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21428,7 +21427,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1686117</v>
+                                    <v>1686099</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21444,12 +21443,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>617406</v>
+                                    <v>617400</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>83254</v>
+                                    <v>83253</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -21755,19 +21754,19 @@
         </relation>
         <relation>
             <name>usertypes</name>
-            <cardinality>5234965</cardinality>
+            <cardinality>5235606</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5234965</v>
+                    <v>5235606</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1352509</v>
+                    <v>1352675</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>5135</v>
+                    <v>5136</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21781,7 +21780,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5234965</v>
+                                    <v>5235606</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21797,7 +21796,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5234965</v>
+                                    <v>5235606</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21813,27 +21812,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>983686</v>
+                                    <v>983806</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>153598</v>
+                                    <v>153617</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>104577</v>
+                                    <v>104590</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>61</b>
-                                    <v>101776</v>
+                                    <v>101789</v>
                                 </b>
                                 <b>
                                     <a>65</a>
                                     <b>874</b>
-                                    <v>8870</v>
+                                    <v>8871</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21849,17 +21848,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1211983</v>
+                                    <v>1212131</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>125120</v>
+                                    <v>125135</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>15406</v>
+                                    <v>15408</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22001,15 +22000,15 @@
         </relation>
         <relation>
             <name>usertypesize</name>
-            <cardinality>1707327</cardinality>
+            <cardinality>1707537</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1707327</v>
+                    <v>1707537</v>
                 </e>
                 <e>
                     <k>size</k>
-                    <v>13539</v>
+                    <v>13540</v>
                 </e>
                 <e>
                     <k>alignment</k>
@@ -22027,7 +22026,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1707327</v>
+                                    <v>1707537</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22043,7 +22042,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1707327</v>
+                                    <v>1707537</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22064,7 +22063,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4201</v>
+                                    <v>4202</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -22115,7 +22114,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10271</v>
+                                    <v>10272</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22218,11 +22217,11 @@
         </relation>
         <relation>
             <name>usertype_uuid</name>
-            <cardinality>36652</cardinality>
+            <cardinality>36651</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>36652</v>
+                    <v>36651</v>
                 </e>
                 <e>
                     <k>uuid</k>
@@ -22240,7 +22239,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36652</v>
+                                    <v>36651</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22271,15 +22270,15 @@
         </relation>
         <relation>
             <name>mangled_name</name>
-            <cardinality>9020312</cardinality>
+            <cardinality>9021417</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9020312</v>
+                    <v>9021417</v>
                 </e>
                 <e>
                     <k>mangled_name</k>
-                    <v>6061784</v>
+                    <v>6062526</v>
                 </e>
                 <e>
                     <k>is_complete</k>
@@ -22297,7 +22296,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9020312</v>
+                                    <v>9021417</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22313,7 +22312,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9020312</v>
+                                    <v>9021417</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22329,12 +22328,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5789134</v>
+                                    <v>5789844</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>874</b>
-                                    <v>272649</v>
+                                    <v>272682</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22350,7 +22349,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6061784</v>
+                                    <v>6062526</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22392,59 +22391,59 @@
         </relation>
         <relation>
             <name>is_pod_class</name>
-            <cardinality>534705</cardinality>
+            <cardinality>534710</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>534705</v>
+                    <v>534710</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_standard_layout_class</name>
-            <cardinality>1254935</cardinality>
+            <cardinality>1255088</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1254935</v>
+                    <v>1255088</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_complete</name>
-            <cardinality>1646635</cardinality>
+            <cardinality>1646837</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1646635</v>
+                    <v>1646837</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_class_template</name>
-            <cardinality>398236</cardinality>
+            <cardinality>398285</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>398236</v>
+                    <v>398285</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>class_instantiation</name>
-            <cardinality>1089664</cardinality>
+            <cardinality>1089798</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>1089664</v>
+                    <v>1089798</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>168538</v>
+                    <v>168559</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22458,7 +22457,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1089664</v>
+                                    <v>1089798</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22474,42 +22473,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>59758</v>
+                                    <v>59766</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>29412</v>
+                                    <v>29416</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>15873</v>
+                                    <v>15875</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>13072</v>
+                                    <v>13073</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>9804</v>
+                                    <v>9805</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>12605</v>
+                                    <v>12606</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>16</b>
-                                    <v>13072</v>
+                                    <v>13073</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>70</b>
-                                    <v>13539</v>
+                                    <v>13540</v>
                                 </b>
                                 <b>
                                     <a>70</a>
@@ -22524,11 +22523,11 @@
         </relation>
         <relation>
             <name>class_template_argument</name>
-            <cardinality>2882763</cardinality>
+            <cardinality>2882732</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>1315517</v>
+                    <v>1315503</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -22536,7 +22535,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>840394</v>
+                    <v>840385</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22550,22 +22549,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>540959</v>
+                                    <v>540953</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>399239</v>
+                                    <v>399235</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>231397</v>
+                                    <v>231395</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>120315</v>
+                                    <v>120314</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -22586,22 +22585,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>567611</v>
+                                    <v>567605</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>410483</v>
+                                    <v>410478</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>244842</v>
+                                    <v>244840</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>113</b>
-                                    <v>92579</v>
+                                    <v>92578</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22709,17 +22708,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>523348</v>
+                                    <v>523343</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>174344</v>
+                                    <v>174342</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>51341</v>
+                                    <v>51340</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -22745,12 +22744,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>746494</v>
+                                    <v>746486</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>77836</v>
+                                    <v>77835</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -22765,11 +22764,11 @@
         </relation>
         <relation>
             <name>class_template_argument_value</name>
-            <cardinality>495344</cardinality>
+            <cardinality>495405</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>304863</v>
+                    <v>304900</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -22777,7 +22776,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>495344</v>
+                    <v>495405</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22791,12 +22790,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>249773</v>
+                                    <v>249803</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>53222</v>
+                                    <v>53229</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -22817,22 +22816,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>189547</v>
+                                    <v>189570</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>81234</v>
+                                    <v>81244</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>12138</v>
+                                    <v>12139</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>21942</v>
+                                    <v>21945</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22910,7 +22909,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>495344</v>
+                                    <v>495405</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22926,7 +22925,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>495344</v>
+                                    <v>495405</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22936,15 +22935,15 @@
         </relation>
         <relation>
             <name>is_proxy_class_for</name>
-            <cardinality>63026</cardinality>
+            <cardinality>63034</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>63026</v>
+                    <v>63034</v>
                 </e>
                 <e>
                     <k>templ_param_id</k>
-                    <v>63026</v>
+                    <v>63034</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22958,7 +22957,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>63026</v>
+                                    <v>63034</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22974,7 +22973,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>63026</v>
+                                    <v>63034</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22984,19 +22983,19 @@
         </relation>
         <relation>
             <name>type_mentions</name>
-            <cardinality>4029136</cardinality>
+            <cardinality>4029118</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4029136</v>
+                    <v>4029118</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>198202</v>
+                    <v>198201</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>3995616</v>
+                    <v>3995598</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -23014,7 +23013,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4029136</v>
+                                    <v>4029118</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23030,7 +23029,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4029136</v>
+                                    <v>4029118</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23046,7 +23045,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4029136</v>
+                                    <v>4029118</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23062,7 +23061,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>97603</v>
+                                    <v>97602</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23087,7 +23086,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>12</b>
-                                    <v>15861</v>
+                                    <v>15860</v>
                                 </b>
                                 <b>
                                     <a>12</a>
@@ -23113,7 +23112,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>97603</v>
+                                    <v>97602</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23138,7 +23137,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>12</b>
-                                    <v>15861</v>
+                                    <v>15860</v>
                                 </b>
                                 <b>
                                     <a>12</a>
@@ -23164,7 +23163,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>198202</v>
+                                    <v>198201</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23180,7 +23179,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3962096</v>
+                                    <v>3962078</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23201,7 +23200,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3962096</v>
+                                    <v>3962078</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23222,7 +23221,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3995616</v>
+                                    <v>3995598</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23280,26 +23279,26 @@
         </relation>
         <relation>
             <name>is_function_template</name>
-            <cardinality>1402931</cardinality>
+            <cardinality>1403103</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1402931</v>
+                    <v>1403103</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_instantiation</name>
-            <cardinality>894823</cardinality>
+            <cardinality>894819</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>894823</v>
+                    <v>894819</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>144434</v>
+                    <v>144433</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23313,7 +23312,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>894823</v>
+                                    <v>894819</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23359,11 +23358,11 @@
         </relation>
         <relation>
             <name>function_template_argument</name>
-            <cardinality>2313492</cardinality>
+            <cardinality>2313481</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
-                    <v>1321577</v>
+                    <v>1321571</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -23371,7 +23370,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>301235</v>
+                    <v>301234</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23385,22 +23384,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>674410</v>
+                                    <v>674407</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>390488</v>
+                                    <v>390486</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>186796</v>
+                                    <v>186795</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>15</b>
-                                    <v>69883</v>
+                                    <v>69882</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23416,22 +23415,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>691828</v>
+                                    <v>691825</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>400277</v>
+                                    <v>400275</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>166869</v>
+                                    <v>166868</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>62602</v>
+                                    <v>62601</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23569,7 +23568,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>184531</v>
+                                    <v>184530</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23610,7 +23609,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>271728</v>
+                                    <v>271727</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23630,11 +23629,11 @@
         </relation>
         <relation>
             <name>function_template_argument_value</name>
-            <cardinality>358995</cardinality>
+            <cardinality>358993</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
-                    <v>192753</v>
+                    <v>192752</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -23642,7 +23641,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>356382</v>
+                    <v>356381</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23656,7 +23655,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>183486</v>
+                                    <v>183485</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23677,7 +23676,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>176136</v>
+                                    <v>176135</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23815,7 +23814,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>353770</v>
+                                    <v>353768</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23836,7 +23835,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>356382</v>
+                                    <v>356381</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23857,11 +23856,11 @@
         </relation>
         <relation>
             <name>variable_instantiation</name>
-            <cardinality>204308</cardinality>
+            <cardinality>204307</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>204308</v>
+                    <v>204307</v>
                 </e>
                 <e>
                     <k>from</k>
@@ -23879,7 +23878,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>204308</v>
+                                    <v>204307</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23940,11 +23939,11 @@
         </relation>
         <relation>
             <name>variable_template_argument</name>
-            <cardinality>383990</cardinality>
+            <cardinality>383988</cardinality>
             <columnsizes>
                 <e>
                     <k>variable_id</k>
-                    <v>195640</v>
+                    <v>195639</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -23952,7 +23951,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>187562</v>
+                    <v>187561</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23981,7 +23980,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>17</b>
-                                    <v>10442</v>
+                                    <v>10441</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24145,7 +24144,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>145597</v>
+                                    <v>145596</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24176,7 +24175,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>170224</v>
+                                    <v>170223</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24357,15 +24356,15 @@
         </relation>
         <relation>
             <name>routinetypes</name>
-            <cardinality>538824</cardinality>
+            <cardinality>538891</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>538824</v>
+                    <v>538891</v>
                 </e>
                 <e>
                     <k>return_type</k>
-                    <v>280751</v>
+                    <v>280750</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24379,7 +24378,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>538824</v>
+                                    <v>538891</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24395,12 +24394,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>244521</v>
+                                    <v>244450</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>20971</v>
+                                    <v>21041</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -24415,19 +24414,19 @@
         </relation>
         <relation>
             <name>routinetypeargs</name>
-            <cardinality>983219</cardinality>
+            <cardinality>983339</cardinality>
             <columnsizes>
                 <e>
                     <k>routine</k>
-                    <v>423447</v>
+                    <v>423499</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>7936</v>
+                    <v>7937</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>226896</v>
+                    <v>226924</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24441,27 +24440,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>152665</v>
+                                    <v>152683</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>133990</v>
+                                    <v>134006</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>63493</v>
+                                    <v>63501</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>45752</v>
+                                    <v>45758</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>18</b>
-                                    <v>27545</v>
+                                    <v>27548</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24477,27 +24476,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>182544</v>
+                                    <v>182566</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>133523</v>
+                                    <v>133539</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>58825</v>
+                                    <v>58832</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>33614</v>
+                                    <v>33618</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>11</b>
-                                    <v>14939</v>
+                                    <v>14941</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24655,27 +24654,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>146595</v>
+                                    <v>146613</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>30813</v>
+                                    <v>30816</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>16807</v>
+                                    <v>16809</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>12</b>
-                                    <v>18207</v>
+                                    <v>18209</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>110</b>
-                                    <v>14472</v>
+                                    <v>14474</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24691,22 +24690,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172740</v>
+                                    <v>172761</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>30813</v>
+                                    <v>30816</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>18674</v>
+                                    <v>18676</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>14</b>
-                                    <v>4668</v>
+                                    <v>4669</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24716,19 +24715,19 @@
         </relation>
         <relation>
             <name>ptrtomembers</name>
-            <cardinality>37816</cardinality>
+            <cardinality>37820</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>37816</v>
+                    <v>37820</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>37816</v>
+                    <v>37820</v>
                 </e>
                 <e>
                     <k>class_id</k>
-                    <v>15406</v>
+                    <v>15408</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24742,7 +24741,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37816</v>
+                                    <v>37820</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24758,7 +24757,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37816</v>
+                                    <v>37820</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24774,7 +24773,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37816</v>
+                                    <v>37820</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24790,7 +24789,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37816</v>
+                                    <v>37820</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24806,7 +24805,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13539</v>
+                                    <v>13540</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -24832,7 +24831,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13539</v>
+                                    <v>13540</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -24852,15 +24851,15 @@
         </relation>
         <relation>
             <name>specifiers</name>
-            <cardinality>24743</cardinality>
+            <cardinality>24746</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>24743</v>
+                    <v>24746</v>
                 </e>
                 <e>
                     <k>str</k>
-                    <v>24743</v>
+                    <v>24746</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24874,7 +24873,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>24743</v>
+                                    <v>24746</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24890,7 +24889,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>24743</v>
+                                    <v>24746</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24900,15 +24899,15 @@
         </relation>
         <relation>
             <name>typespecifiers</name>
-            <cardinality>1133083</cardinality>
+            <cardinality>1133221</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>1114875</v>
+                    <v>1115011</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>3734</v>
+                    <v>3735</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24922,12 +24921,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1096667</v>
+                                    <v>1096801</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>18207</v>
+                                    <v>18209</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24988,15 +24987,15 @@
         </relation>
         <relation>
             <name>funspecifiers</name>
-            <cardinality>10304659</cardinality>
+            <cardinality>10305922</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>4068267</v>
+                    <v>4068766</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>8403</v>
+                    <v>8404</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25010,27 +25009,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1357645</v>
+                                    <v>1357811</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>641006</v>
+                                    <v>641085</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>985086</v>
+                                    <v>985207</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>780132</v>
+                                    <v>780228</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>304396</v>
+                                    <v>304433</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25141,15 +25140,15 @@
         </relation>
         <relation>
             <name>varspecifiers</name>
-            <cardinality>2246090</cardinality>
+            <cardinality>2246366</cardinality>
             <columnsizes>
                 <e>
                     <k>var_id</k>
-                    <v>1225055</v>
+                    <v>1225205</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>3734</v>
+                    <v>3735</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25163,22 +25162,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>730177</v>
+                                    <v>730267</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>202619</v>
+                                    <v>202644</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>58358</v>
+                                    <v>58365</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>233899</v>
+                                    <v>233928</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25287,11 +25286,11 @@
         </relation>
         <relation>
             <name>attributes</name>
-            <cardinality>561639</cardinality>
+            <cardinality>561708</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>561639</v>
+                    <v>561708</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -25299,7 +25298,7 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>11204</v>
+                    <v>11206</v>
                 </e>
                 <e>
                     <k>name_space</k>
@@ -25307,7 +25306,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>481338</v>
+                    <v>481397</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25321,7 +25320,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>561639</v>
+                                    <v>561708</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25337,7 +25336,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>561639</v>
+                                    <v>561708</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25353,7 +25352,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>561639</v>
+                                    <v>561708</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25369,7 +25368,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>561639</v>
+                                    <v>561708</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25560,7 +25559,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10271</v>
+                                    <v>10272</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25581,7 +25580,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11204</v>
+                                    <v>11206</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25752,17 +25751,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>431850</v>
+                                    <v>431903</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>20075</v>
+                                    <v>20077</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>29412</v>
+                                    <v>29416</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25778,7 +25777,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>481338</v>
+                                    <v>481397</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25794,17 +25793,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>433251</v>
+                                    <v>433304</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>19608</v>
+                                    <v>19610</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>28478</v>
+                                    <v>28482</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25820,7 +25819,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>481338</v>
+                                    <v>481397</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25830,11 +25829,11 @@
         </relation>
         <relation>
             <name>attribute_args</name>
-            <cardinality>344080</cardinality>
+            <cardinality>344122</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>344080</v>
+                    <v>344122</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -25842,7 +25841,7 @@
                 </e>
                 <e>
                     <k>attribute</k>
-                    <v>262845</v>
+                    <v>262877</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -25850,7 +25849,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>327739</v>
+                    <v>327779</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25864,7 +25863,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>344080</v>
+                                    <v>344122</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25880,7 +25879,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>344080</v>
+                                    <v>344122</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25896,7 +25895,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>344080</v>
+                                    <v>344122</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25912,7 +25911,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>344080</v>
+                                    <v>344122</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26027,17 +26026,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>197484</v>
+                                    <v>197508</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>49487</v>
+                                    <v>49493</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>15873</v>
+                                    <v>15875</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26053,12 +26052,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>252574</v>
+                                    <v>252605</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10271</v>
+                                    <v>10272</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26074,17 +26073,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>197484</v>
+                                    <v>197508</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>49487</v>
+                                    <v>49493</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>15873</v>
+                                    <v>15875</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26100,17 +26099,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>197484</v>
+                                    <v>197508</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>49487</v>
+                                    <v>49493</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>15873</v>
+                                    <v>15875</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26225,12 +26224,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>313733</v>
+                                    <v>313772</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>14005</v>
+                                    <v>14007</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26246,12 +26245,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>315134</v>
+                                    <v>315172</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12605</v>
+                                    <v>12606</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26267,12 +26266,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>313733</v>
+                                    <v>313772</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>14005</v>
+                                    <v>14007</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26288,7 +26287,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>327739</v>
+                                    <v>327779</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26298,15 +26297,15 @@
         </relation>
         <relation>
             <name>attribute_arg_value</name>
-            <cardinality>25210</cardinality>
+            <cardinality>25213</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>25210</v>
+                    <v>25213</v>
                 </e>
                 <e>
                     <k>value</k>
-                    <v>15873</v>
+                    <v>15875</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26320,7 +26319,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25210</v>
+                                    <v>25213</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26336,7 +26335,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14472</v>
+                                    <v>14474</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26399,15 +26398,15 @@
         </relation>
         <relation>
             <name>attribute_arg_constant</name>
-            <cardinality>318402</cardinality>
+            <cardinality>318441</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>318402</v>
+                    <v>318441</v>
                 </e>
                 <e>
                     <k>constant</k>
-                    <v>318402</v>
+                    <v>318441</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26421,7 +26420,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>318402</v>
+                                    <v>318441</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26437,7 +26436,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>318402</v>
+                                    <v>318441</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26548,15 +26547,15 @@
         </relation>
         <relation>
             <name>typeattributes</name>
-            <cardinality>60997</cardinality>
+            <cardinality>61863</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>37617</v>
+                    <v>61469</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>60572</v>
+                    <v>19701</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26570,17 +26569,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14636</v>
+                                    <v>61075</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>22580</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>400</v>
+                                    <v>394</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26596,12 +26590,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>60477</v>
+                                    <v>16254</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>26</b>
-                                    <v>95</v>
+                                    <b>5</b>
+                                    <v>1576</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>23</b>
+                                    <v>1379</v>
+                                </b>
+                                <b>
+                                    <a>57</a>
+                                    <b>58</b>
+                                    <v>492</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26611,15 +26615,15 @@
         </relation>
         <relation>
             <name>funcattributes</name>
-            <cardinality>630268</cardinality>
+            <cardinality>630345</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>443522</v>
+                    <v>443576</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>524757</v>
+                    <v>524821</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26633,17 +26637,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>338477</v>
+                                    <v>338519</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>64427</v>
+                                    <v>64435</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>39683</v>
+                                    <v>39688</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -26664,12 +26668,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>506082</v>
+                                    <v>506144</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>17</b>
-                                    <v>18674</v>
+                                    <v>18676</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26805,15 +26809,15 @@
         </relation>
         <relation>
             <name>unspecifiedtype</name>
-            <cardinality>9489045</cardinality>
+            <cardinality>9490208</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>9489045</v>
+                    <v>9490208</v>
                 </e>
                 <e>
                     <k>unspecified_type_id</k>
-                    <v>6491300</v>
+                    <v>6492096</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26827,7 +26831,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9489045</v>
+                                    <v>9490208</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26843,17 +26847,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4559877</v>
+                                    <v>4560436</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1715731</v>
+                                    <v>1715941</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>145</b>
-                                    <v>215691</v>
+                                    <v>215718</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26863,19 +26867,19 @@
         </relation>
         <relation>
             <name>member</name>
-            <cardinality>3881054</cardinality>
+            <cardinality>3881530</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>545766</v>
+                    <v>545832</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>92906</v>
+                    <v>92917</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>3809624</v>
+                    <v>3810090</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26889,47 +26893,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>129788</v>
+                                    <v>129804</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>64894</v>
+                                    <v>64902</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>73297</v>
+                                    <v>73306</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>75165</v>
+                                    <v>75174</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>40617</v>
+                                    <v>40622</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>46686</v>
+                                    <v>46692</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>14</b>
-                                    <v>45752</v>
+                                    <v>45758</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>30</b>
-                                    <v>41551</v>
+                                    <v>41556</v>
                                 </b>
                                 <b>
                                     <a>30</a>
                                     <b>200</b>
-                                    <v>28011</v>
+                                    <v>28015</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26945,52 +26949,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>129788</v>
+                                    <v>129804</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>64894</v>
+                                    <v>64902</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>73297</v>
+                                    <v>73306</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>76099</v>
+                                    <v>76108</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>39683</v>
+                                    <v>39688</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>24277</v>
+                                    <v>24279</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>42017</v>
+                                    <v>42023</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>17</b>
-                                    <v>43885</v>
+                                    <v>43890</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>41</b>
-                                    <v>41551</v>
+                                    <v>41556</v>
                                 </b>
                                 <b>
                                     <a>41</a>
                                     <b>200</b>
-                                    <v>10271</v>
+                                    <v>10272</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27006,57 +27010,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26147</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7002</v>
+                                    <v>7003</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>7936</v>
+                                    <v>7937</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>5602</v>
+                                    <v>5603</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>5602</v>
+                                    <v>5603</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>7469</v>
+                                    <v>7470</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>16</b>
-                                    <v>7002</v>
+                                    <v>7003</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>52</b>
-                                    <v>7002</v>
+                                    <v>7003</v>
                                 </b>
                                 <b>
                                     <a>52</a>
                                     <b>107</b>
-                                    <v>7002</v>
+                                    <v>7003</v>
                                 </b>
                                 <b>
                                     <a>108</a>
                                     <b>577</b>
-                                    <v>7002</v>
+                                    <v>7003</v>
                                 </b>
                                 <b>
                                     <a>737</a>
@@ -27077,57 +27081,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26147</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7002</v>
+                                    <v>7003</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>3734</v>
+                                    <v>3735</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>7936</v>
+                                    <v>7937</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>5602</v>
+                                    <v>5603</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>5602</v>
+                                    <v>5603</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>7469</v>
+                                    <v>7470</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>16</b>
-                                    <v>7002</v>
+                                    <v>7003</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>52</b>
-                                    <v>7002</v>
+                                    <v>7003</v>
                                 </b>
                                 <b>
                                     <a>52</a>
                                     <b>107</b>
-                                    <v>7002</v>
+                                    <v>7003</v>
                                 </b>
                                 <b>
                                     <a>108</a>
                                     <b>577</b>
-                                    <v>7002</v>
+                                    <v>7003</v>
                                 </b>
                                 <b>
                                     <a>738</a>
@@ -27148,7 +27152,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3809624</v>
+                                    <v>3810090</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27164,12 +27168,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3738193</v>
+                                    <v>3738651</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>71430</v>
+                                    <v>71439</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27179,15 +27183,15 @@
         </relation>
         <relation>
             <name>enclosingfunction</name>
-            <cardinality>118329</cardinality>
+            <cardinality>118327</cardinality>
             <columnsizes>
                 <e>
                     <k>child</k>
-                    <v>118329</v>
+                    <v>118327</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>67665</v>
+                    <v>67664</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27201,7 +27205,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>118329</v>
+                                    <v>118327</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27232,7 +27236,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>45</b>
-                                    <v>4888</v>
+                                    <v>4887</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27242,15 +27246,15 @@
         </relation>
         <relation>
             <name>derivations</name>
-            <cardinality>391568</cardinality>
+            <cardinality>391566</cardinality>
             <columnsizes>
                 <e>
                     <k>derivation</k>
-                    <v>391568</v>
+                    <v>391566</v>
                 </e>
                 <e>
                     <k>sub</k>
-                    <v>371293</v>
+                    <v>371291</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -27258,7 +27262,7 @@
                 </e>
                 <e>
                     <k>super</k>
-                    <v>202751</v>
+                    <v>202750</v>
                 </e>
                 <e>
                     <k>location</k>
@@ -27276,7 +27280,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>391568</v>
+                                    <v>391566</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27292,7 +27296,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>391568</v>
+                                    <v>391566</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27308,7 +27312,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>391568</v>
+                                    <v>391566</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27324,7 +27328,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>391568</v>
+                                    <v>391566</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27340,7 +27344,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>356313</v>
+                                    <v>356311</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27361,7 +27365,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>356313</v>
+                                    <v>356311</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27382,7 +27386,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>356313</v>
+                                    <v>356311</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27403,7 +27407,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>356313</v>
+                                    <v>356311</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27553,7 +27557,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>195366</v>
+                                    <v>195365</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27574,7 +27578,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>195366</v>
+                                    <v>195365</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27595,7 +27599,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>202298</v>
+                                    <v>202297</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27616,7 +27620,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>199093</v>
+                                    <v>199092</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27642,7 +27646,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>3205</v>
+                                    <v>3204</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -27678,7 +27682,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>3205</v>
+                                    <v>3204</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -27750,11 +27754,11 @@
         </relation>
         <relation>
             <name>derspecifiers</name>
-            <cardinality>393449</cardinality>
+            <cardinality>393447</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>391184</v>
+                    <v>391183</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -27772,7 +27776,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>388920</v>
+                                    <v>388918</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27818,11 +27822,11 @@
         </relation>
         <relation>
             <name>direct_base_offsets</name>
-            <cardinality>362618</cardinality>
+            <cardinality>362617</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>362618</v>
+                    <v>362617</v>
                 </e>
                 <e>
                     <k>offset</k>
@@ -27840,7 +27844,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>362618</v>
+                                    <v>362617</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28182,11 +28186,11 @@
         </relation>
         <relation>
             <name>frienddecls</name>
-            <cardinality>707052</cardinality>
+            <cardinality>707049</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>707052</v>
+                    <v>707049</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -28212,7 +28216,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>707052</v>
+                                    <v>707049</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28228,7 +28232,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>707052</v>
+                                    <v>707049</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28244,7 +28248,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>707052</v>
+                                    <v>707049</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28295,7 +28299,7 @@
                                 <b>
                                     <a>37</a>
                                     <b>55</b>
-                                    <v>3205</v>
+                                    <v>3204</v>
                                 </b>
                                 <b>
                                     <a>55</a>
@@ -28351,7 +28355,7 @@
                                 <b>
                                     <a>37</a>
                                     <b>55</b>
-                                    <v>3205</v>
+                                    <v>3204</v>
                                 </b>
                                 <b>
                                     <a>55</a>
@@ -28563,19 +28567,19 @@
         </relation>
         <relation>
             <name>comments</name>
-            <cardinality>8266137</cardinality>
+            <cardinality>8266100</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>8266137</v>
+                    <v>8266100</v>
                 </e>
                 <e>
                     <k>contents</k>
-                    <v>3147578</v>
+                    <v>3147564</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>8266137</v>
+                    <v>8266100</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28589,7 +28593,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8266137</v>
+                                    <v>8266100</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28605,7 +28609,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8266137</v>
+                                    <v>8266100</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28621,12 +28625,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2879337</v>
+                                    <v>2879324</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>236620</v>
+                                    <v>236618</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -28647,12 +28651,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2879337</v>
+                                    <v>2879324</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>236620</v>
+                                    <v>236618</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -28673,7 +28677,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8266137</v>
+                                    <v>8266100</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28689,7 +28693,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8266137</v>
+                                    <v>8266100</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28699,15 +28703,15 @@
         </relation>
         <relation>
             <name>commentbinding</name>
-            <cardinality>3091117</cardinality>
+            <cardinality>3091496</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2445442</v>
+                    <v>2445742</v>
                 </e>
                 <e>
                     <k>element</k>
-                    <v>3014551</v>
+                    <v>3014921</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28721,12 +28725,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2368409</v>
+                                    <v>2368699</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>97</b>
-                                    <v>77032</v>
+                                    <v>77042</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28742,12 +28746,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2937985</v>
+                                    <v>2938345</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>76565</v>
+                                    <v>76575</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28757,15 +28761,15 @@
         </relation>
         <relation>
             <name>exprconv</name>
-            <cardinality>7033022</cardinality>
+            <cardinality>7032992</cardinality>
             <columnsizes>
                 <e>
                     <k>converted</k>
-                    <v>7033022</v>
+                    <v>7032992</v>
                 </e>
                 <e>
                     <k>conversion</k>
-                    <v>7033022</v>
+                    <v>7032992</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28779,7 +28783,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7033022</v>
+                                    <v>7032992</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28795,7 +28799,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7033022</v>
+                                    <v>7032992</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28805,22 +28809,22 @@
         </relation>
         <relation>
             <name>compgenerated</name>
-            <cardinality>7908075</cardinality>
+            <cardinality>7908039</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7908075</v>
+                    <v>7908039</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>synthetic_destructor_call</name>
-            <cardinality>512503</cardinality>
+            <cardinality>512501</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
-                    <v>325805</v>
+                    <v>325803</v>
                 </e>
                 <e>
                     <k>i</k>
@@ -28828,7 +28832,7 @@
                 </e>
                 <e>
                     <k>destructor_call</k>
-                    <v>512503</v>
+                    <v>512501</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28842,7 +28846,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>227848</v>
+                                    <v>227847</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28857,7 +28861,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>24622</v>
+                                    <v>24621</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -28878,7 +28882,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>227848</v>
+                                    <v>227847</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28893,7 +28897,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>24622</v>
+                                    <v>24621</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -29126,7 +29130,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>512503</v>
+                                    <v>512501</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29142,7 +29146,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>512503</v>
+                                    <v>512501</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29152,15 +29156,15 @@
         </relation>
         <relation>
             <name>namespaces</name>
-            <cardinality>12138</cardinality>
+            <cardinality>12139</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12138</v>
+                    <v>12139</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>9804</v>
+                    <v>9805</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29174,7 +29178,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12138</v>
+                                    <v>12139</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29190,7 +29194,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8403</v>
+                                    <v>8404</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29221,15 +29225,15 @@
         </relation>
         <relation>
             <name>namespacembrs</name>
-            <cardinality>2388018</cardinality>
+            <cardinality>2388310</cardinality>
             <columnsizes>
                 <e>
                     <k>parentid</k>
-                    <v>10271</v>
+                    <v>10272</v>
                 </e>
                 <e>
                     <k>memberid</k>
-                    <v>2388018</v>
+                    <v>2388310</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29304,7 +29308,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2388018</v>
+                                    <v>2388310</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29314,11 +29318,11 @@
         </relation>
         <relation>
             <name>exprparents</name>
-            <cardinality>14206517</cardinality>
+            <cardinality>14206453</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>14206517</v>
+                    <v>14206453</v>
                 </e>
                 <e>
                     <k>child_index</k>
@@ -29326,7 +29330,7 @@
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>9453690</v>
+                    <v>9453648</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29340,7 +29344,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14206517</v>
+                                    <v>14206453</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29356,7 +29360,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14206517</v>
+                                    <v>14206453</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29474,17 +29478,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5409361</v>
+                                    <v>5409337</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3706591</v>
+                                    <v>3706574</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>712</b>
-                                    <v>337737</v>
+                                    <v>337736</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29500,17 +29504,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5409361</v>
+                                    <v>5409337</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3706591</v>
+                                    <v>3706574</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>712</b>
-                                    <v>337737</v>
+                                    <v>337736</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29520,11 +29524,11 @@
         </relation>
         <relation>
             <name>expr_isload</name>
-            <cardinality>5096886</cardinality>
+            <cardinality>5096863</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>5096886</v>
+                    <v>5096863</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -29604,11 +29608,11 @@
         </relation>
         <relation>
             <name>iscall</name>
-            <cardinality>3218003</cardinality>
+            <cardinality>3217989</cardinality>
             <columnsizes>
                 <e>
                     <k>caller</k>
-                    <v>3218003</v>
+                    <v>3217989</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -29626,7 +29630,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3218003</v>
+                                    <v>3217989</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29662,11 +29666,11 @@
         </relation>
         <relation>
             <name>numtemplatearguments</name>
-            <cardinality>393832</cardinality>
+            <cardinality>393830</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>393832</v>
+                    <v>393830</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -29684,7 +29688,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>393832</v>
+                                    <v>393830</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29788,23 +29792,23 @@
         </relation>
         <relation>
             <name>namequalifiers</name>
-            <cardinality>1513800</cardinality>
+            <cardinality>1513793</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1513800</v>
+                    <v>1513793</v>
                 </e>
                 <e>
                     <k>qualifiableelement</k>
-                    <v>1513800</v>
+                    <v>1513793</v>
                 </e>
                 <e>
                     <k>qualifyingelement</k>
-                    <v>97519</v>
+                    <v>97518</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>304298</v>
+                    <v>304297</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29818,7 +29822,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1513800</v>
+                                    <v>1513793</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29834,7 +29838,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1513800</v>
+                                    <v>1513793</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29850,7 +29854,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1513800</v>
+                                    <v>1513793</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29866,7 +29870,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1513800</v>
+                                    <v>1513793</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29882,7 +29886,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1513800</v>
+                                    <v>1513793</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29898,7 +29902,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1513800</v>
+                                    <v>1513793</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30017,7 +30021,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>100559</v>
+                                    <v>100558</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30058,7 +30062,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>100559</v>
+                                    <v>100558</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30099,7 +30103,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>137074</v>
+                                    <v>137073</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30124,15 +30128,15 @@
         </relation>
         <relation>
             <name>varbind</name>
-            <cardinality>6029127</cardinality>
+            <cardinality>6029100</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>6029127</v>
+                    <v>6029100</v>
                 </e>
                 <e>
                     <k>var</k>
-                    <v>768530</v>
+                    <v>768527</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30146,7 +30150,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6029127</v>
+                                    <v>6029100</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30167,12 +30171,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>137874</v>
+                                    <v>137873</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>106293</v>
+                                    <v>106292</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -30202,7 +30206,7 @@
                                 <b>
                                     <a>13</a>
                                     <b>28</b>
-                                    <v>58880</v>
+                                    <v>58879</v>
                                 </b>
                                 <b>
                                     <a>28</a>
@@ -30217,15 +30221,15 @@
         </relation>
         <relation>
             <name>funbind</name>
-            <cardinality>3224501</cardinality>
+            <cardinality>3224486</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>3218288</v>
+                    <v>3218274</v>
                 </e>
                 <e>
                     <k>fun</k>
-                    <v>511344</v>
+                    <v>511323</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30239,7 +30243,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3212076</v>
+                                    <v>3212061</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30260,12 +30264,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>315090</v>
+                                    <v>315050</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>77893</v>
+                                    <v>77912</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -30421,11 +30425,11 @@
         </relation>
         <relation>
             <name>expr_deallocator</name>
-            <cardinality>54694</cardinality>
+            <cardinality>54693</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>54694</v>
+                    <v>54693</v>
                 </e>
                 <e>
                     <k>func</k>
@@ -30447,7 +30451,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>54694</v>
+                                    <v>54693</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30463,7 +30467,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>54694</v>
+                                    <v>54693</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30568,15 +30572,15 @@
         </relation>
         <relation>
             <name>expr_cond_guard</name>
-            <cardinality>657237</cardinality>
+            <cardinality>657235</cardinality>
             <columnsizes>
                 <e>
                     <k>cond</k>
-                    <v>657237</v>
+                    <v>657235</v>
                 </e>
                 <e>
                     <k>guard</k>
-                    <v>657237</v>
+                    <v>657235</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30590,7 +30594,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>657237</v>
+                                    <v>657235</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30606,7 +30610,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>657237</v>
+                                    <v>657235</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30616,15 +30620,15 @@
         </relation>
         <relation>
             <name>expr_cond_true</name>
-            <cardinality>657235</cardinality>
+            <cardinality>657232</cardinality>
             <columnsizes>
                 <e>
                     <k>cond</k>
-                    <v>657235</v>
+                    <v>657232</v>
                 </e>
                 <e>
                     <k>true</k>
-                    <v>657235</v>
+                    <v>657232</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30638,7 +30642,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>657235</v>
+                                    <v>657232</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30654,7 +30658,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>657235</v>
+                                    <v>657232</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30664,15 +30668,15 @@
         </relation>
         <relation>
             <name>expr_cond_false</name>
-            <cardinality>657237</cardinality>
+            <cardinality>657235</cardinality>
             <columnsizes>
                 <e>
                     <k>cond</k>
-                    <v>657237</v>
+                    <v>657235</v>
                 </e>
                 <e>
                     <k>false</k>
-                    <v>657237</v>
+                    <v>657235</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30686,7 +30690,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>657237</v>
+                                    <v>657235</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30702,7 +30706,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>657237</v>
+                                    <v>657235</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30712,11 +30716,11 @@
         </relation>
         <relation>
             <name>values</name>
-            <cardinality>10776699</cardinality>
+            <cardinality>10776651</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>10776699</v>
+                    <v>10776651</v>
                 </e>
                 <e>
                     <k>str</k>
@@ -30734,7 +30738,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10776699</v>
+                                    <v>10776651</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30750,7 +30754,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>59545</v>
+                                    <v>59544</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30780,11 +30784,11 @@
         </relation>
         <relation>
             <name>valuetext</name>
-            <cardinality>4757348</cardinality>
+            <cardinality>4757344</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4757348</v>
+                    <v>4757344</v>
                 </e>
                 <e>
                     <k>text</k>
@@ -30802,7 +30806,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4757348</v>
+                                    <v>4757344</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30843,15 +30847,15 @@
         </relation>
         <relation>
             <name>valuebind</name>
-            <cardinality>11210920</cardinality>
+            <cardinality>11210870</cardinality>
             <columnsizes>
                 <e>
                     <k>val</k>
-                    <v>10776699</v>
+                    <v>10776651</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>11210920</v>
+                    <v>11210870</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30865,12 +30869,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10365022</v>
+                                    <v>10364976</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>411677</v>
+                                    <v>411675</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30886,7 +30890,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11210920</v>
+                                    <v>11210870</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30896,11 +30900,11 @@
         </relation>
         <relation>
             <name>fieldoffsets</name>
-            <cardinality>1054697</cardinality>
+            <cardinality>1054692</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1054697</v>
+                    <v>1054692</v>
                 </e>
                 <e>
                     <k>byteoffset</k>
@@ -30922,7 +30926,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1054697</v>
+                                    <v>1054692</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30938,7 +30942,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1054697</v>
+                                    <v>1054692</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31283,23 +31287,23 @@
         </relation>
         <relation>
             <name>initialisers</name>
-            <cardinality>1710781</cardinality>
+            <cardinality>1710773</cardinality>
             <columnsizes>
                 <e>
                     <k>init</k>
-                    <v>1710781</v>
+                    <v>1710773</v>
                 </e>
                 <e>
                     <k>var</k>
-                    <v>719764</v>
+                    <v>719761</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>1710781</v>
+                    <v>1710773</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>394651</v>
+                    <v>394649</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -31313,7 +31317,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1710781</v>
+                                    <v>1710773</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31329,7 +31333,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1710781</v>
+                                    <v>1710773</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31345,7 +31349,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1710781</v>
+                                    <v>1710773</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31361,7 +31365,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>633988</v>
+                                    <v>633986</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31387,7 +31391,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>633988</v>
+                                    <v>633986</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31413,7 +31417,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>719758</v>
+                                    <v>719754</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31434,7 +31438,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1710781</v>
+                                    <v>1710773</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31450,7 +31454,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1710781</v>
+                                    <v>1710773</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31466,7 +31470,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1710781</v>
+                                    <v>1710773</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31482,7 +31486,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>321715</v>
+                                    <v>321714</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31513,7 +31517,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>344607</v>
+                                    <v>344605</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31539,7 +31543,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>321715</v>
+                                    <v>321714</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31575,15 +31579,15 @@
         </relation>
         <relation>
             <name>expr_ancestor</name>
-            <cardinality>516626</cardinality>
+            <cardinality>516623</cardinality>
             <columnsizes>
                 <e>
                     <k>exp</k>
-                    <v>516626</v>
+                    <v>516623</v>
                 </e>
                 <e>
                     <k>ancestor</k>
-                    <v>308516</v>
+                    <v>308515</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -31597,7 +31601,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>516626</v>
+                                    <v>516623</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31613,7 +31617,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>203568</v>
+                                    <v>203567</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31628,7 +31632,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>25154</v>
+                                    <v>25153</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -31643,11 +31647,11 @@
         </relation>
         <relation>
             <name>exprs</name>
-            <cardinality>18387506</cardinality>
+            <cardinality>18387424</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>18387506</v>
+                    <v>18387424</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -31655,7 +31659,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>8488094</v>
+                    <v>8488154</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -31669,7 +31673,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18387506</v>
+                                    <v>18387424</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31685,7 +31689,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18387506</v>
+                                    <v>18387424</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31863,22 +31867,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7145154</v>
+                                    <v>7145204</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>663031</v>
+                                    <v>663036</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>18</b>
-                                    <v>638103</v>
+                                    <v>638107</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>71656</b>
-                                    <v>41805</v>
+                                    <v>41806</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31894,17 +31898,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7251222</v>
+                                    <v>7251273</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>618242</v>
+                                    <v>618246</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>32</b>
-                                    <v>618630</v>
+                                    <v>618634</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31914,15 +31918,15 @@
         </relation>
         <relation>
             <name>expr_reuse</name>
-            <cardinality>373719</cardinality>
+            <cardinality>373717</cardinality>
             <columnsizes>
                 <e>
                     <k>reuse</k>
-                    <v>373719</v>
+                    <v>373717</v>
                 </e>
                 <e>
                     <k>original</k>
-                    <v>373700</v>
+                    <v>373698</v>
                 </e>
                 <e>
                     <k>value_category</k>
@@ -31940,7 +31944,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>373719</v>
+                                    <v>373717</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31956,7 +31960,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>373719</v>
+                                    <v>373717</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31972,7 +31976,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>373681</v>
+                                    <v>373679</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31993,7 +31997,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>373700</v>
+                                    <v>373698</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32045,15 +32049,15 @@
         </relation>
         <relation>
             <name>expr_types</name>
-            <cardinality>18451524</cardinality>
+            <cardinality>18451442</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>18319863</v>
+                    <v>18319782</v>
                 </e>
                 <e>
                     <k>typeid</k>
-                    <v>1214606</v>
+                    <v>1214616</v>
                 </e>
                 <e>
                     <k>value_category</k>
@@ -32071,12 +32075,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18188202</v>
+                                    <v>18188122</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>131661</v>
+                                    <v>131659</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32092,7 +32096,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18319863</v>
+                                    <v>18319782</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32108,42 +32112,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>438558</v>
+                                    <v>438565</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>249335</v>
+                                    <v>249332</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>102807</v>
+                                    <v>102839</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>81888</v>
+                                    <v>81865</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>109275</v>
+                                    <v>109274</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>14</b>
-                                    <v>96485</v>
+                                    <v>96495</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>41</b>
-                                    <v>91665</v>
+                                    <v>91664</v>
                                 </b>
                                 <b>
                                     <a>41</a>
                                     <b>125325</b>
-                                    <v>44590</v>
+                                    <v>44578</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32159,12 +32163,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1050219</v>
+                                    <v>1050230</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>154193</v>
+                                    <v>154192</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -32193,8 +32197,8 @@
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>1239479</a>
-                                    <b>1239480</b>
+                                    <a>1239489</a>
+                                    <b>1239490</b>
                                     <v>11</v>
                                 </b>
                             </bs>
@@ -32219,8 +32223,8 @@
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>90427</a>
-                                    <b>90428</b>
+                                    <a>90429</a>
+                                    <b>90430</b>
                                     <v>11</v>
                                 </b>
                             </bs>
@@ -32274,7 +32278,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>14736</v>
+                                    <v>14735</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -33483,7 +33487,7 @@
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>20104</v>
+                    <v>20103</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33528,11 +33532,11 @@
         </relation>
         <relation>
             <name>sizeof_bind</name>
-            <cardinality>199184</cardinality>
+            <cardinality>199183</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>199184</v>
+                    <v>199183</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -33550,7 +33554,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>199184</v>
+                                    <v>199183</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33659,11 +33663,11 @@
         </relation>
         <relation>
             <name>lambdas</name>
-            <cardinality>21475</cardinality>
+            <cardinality>21478</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>21475</v>
+                    <v>21478</v>
                 </e>
                 <e>
                     <k>default_capture</k>
@@ -33685,7 +33689,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21475</v>
+                                    <v>21478</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33701,7 +33705,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21475</v>
+                                    <v>21478</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33775,15 +33779,15 @@
         </relation>
         <relation>
             <name>lambda_capture</name>
-            <cardinality>28011</cardinality>
+            <cardinality>28015</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>28011</v>
+                    <v>28015</v>
                 </e>
                 <e>
                     <k>lambda</k>
-                    <v>20542</v>
+                    <v>20544</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -33791,7 +33795,7 @@
                 </e>
                 <e>
                     <k>field</k>
-                    <v>28011</v>
+                    <v>28015</v>
                 </e>
                 <e>
                     <k>captured_by_reference</k>
@@ -33817,7 +33821,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28011</v>
+                                    <v>28015</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33833,7 +33837,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28011</v>
+                                    <v>28015</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33849,7 +33853,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28011</v>
+                                    <v>28015</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33865,7 +33869,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28011</v>
+                                    <v>28015</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33881,7 +33885,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28011</v>
+                                    <v>28015</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33897,7 +33901,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28011</v>
+                                    <v>28015</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33913,12 +33917,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13072</v>
+                                    <v>13073</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7469</v>
+                                    <v>7470</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33934,12 +33938,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13072</v>
+                                    <v>13073</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7469</v>
+                                    <v>7470</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33955,12 +33959,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13072</v>
+                                    <v>13073</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7469</v>
+                                    <v>7470</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33976,7 +33980,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20542</v>
+                                    <v>20544</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33992,7 +33996,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20542</v>
+                                    <v>20544</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34008,12 +34012,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13072</v>
+                                    <v>13073</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7469</v>
+                                    <v>7470</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34145,7 +34149,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28011</v>
+                                    <v>28015</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34161,7 +34165,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28011</v>
+                                    <v>28015</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34177,7 +34181,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28011</v>
+                                    <v>28015</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34193,7 +34197,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28011</v>
+                                    <v>28015</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34209,7 +34213,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28011</v>
+                                    <v>28015</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34225,7 +34229,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28011</v>
+                                    <v>28015</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34654,11 +34658,11 @@
         </relation>
         <relation>
             <name>stmts</name>
-            <cardinality>4630345</cardinality>
+            <cardinality>4630324</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4630345</v>
+                    <v>4630324</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -34666,7 +34670,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2171742</v>
+                    <v>2171732</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34680,7 +34684,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4630345</v>
+                                    <v>4630324</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34696,7 +34700,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4630345</v>
+                                    <v>4630324</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34924,12 +34928,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1725789</v>
+                                    <v>1725781</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>178302</v>
+                                    <v>178301</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -34955,7 +34959,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2117857</v>
+                                    <v>2117848</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -35114,15 +35118,15 @@
         </relation>
         <relation>
             <name>if_then</name>
-            <cardinality>725914</cardinality>
+            <cardinality>725911</cardinality>
             <columnsizes>
                 <e>
                     <k>if_stmt</k>
-                    <v>725914</v>
+                    <v>725911</v>
                 </e>
                 <e>
                     <k>then_id</k>
-                    <v>725914</v>
+                    <v>725911</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35136,7 +35140,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>725914</v>
+                                    <v>725911</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35152,7 +35156,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>725914</v>
+                                    <v>725911</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35162,15 +35166,15 @@
         </relation>
         <relation>
             <name>if_else</name>
-            <cardinality>184669</cardinality>
+            <cardinality>184668</cardinality>
             <columnsizes>
                 <e>
                     <k>if_stmt</k>
-                    <v>184669</v>
+                    <v>184668</v>
                 </e>
                 <e>
                     <k>else_id</k>
-                    <v>184669</v>
+                    <v>184668</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35184,7 +35188,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>184669</v>
+                                    <v>184668</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35200,7 +35204,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>184669</v>
+                                    <v>184668</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35258,15 +35262,15 @@
         </relation>
         <relation>
             <name>constexpr_if_then</name>
-            <cardinality>52998</cardinality>
+            <cardinality>52997</cardinality>
             <columnsizes>
                 <e>
                     <k>constexpr_if_stmt</k>
-                    <v>52998</v>
+                    <v>52997</v>
                 </e>
                 <e>
                     <k>then_id</k>
-                    <v>52998</v>
+                    <v>52997</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35280,7 +35284,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52998</v>
+                                    <v>52997</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35296,7 +35300,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52998</v>
+                                    <v>52997</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35354,15 +35358,15 @@
         </relation>
         <relation>
             <name>while_body</name>
-            <cardinality>29317</cardinality>
+            <cardinality>29316</cardinality>
             <columnsizes>
                 <e>
                     <k>while_stmt</k>
-                    <v>29317</v>
+                    <v>29316</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>29317</v>
+                    <v>29316</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35376,7 +35380,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29317</v>
+                                    <v>29316</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35392,7 +35396,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29317</v>
+                                    <v>29316</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35402,15 +35406,15 @@
         </relation>
         <relation>
             <name>do_body</name>
-            <cardinality>148874</cardinality>
+            <cardinality>148873</cardinality>
             <columnsizes>
                 <e>
                     <k>do_stmt</k>
-                    <v>148874</v>
+                    <v>148873</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>148874</v>
+                    <v>148873</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35424,7 +35428,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>148874</v>
+                                    <v>148873</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35440,7 +35444,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>148874</v>
+                                    <v>148873</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35498,7 +35502,7 @@
         </relation>
         <relation>
             <name>switch_case</name>
-            <cardinality>207501</cardinality>
+            <cardinality>207500</cardinality>
             <columnsizes>
                 <e>
                     <k>switch_stmt</k>
@@ -35510,7 +35514,7 @@
                 </e>
                 <e>
                     <k>case_id</k>
-                    <v>207501</v>
+                    <v>207500</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35738,7 +35742,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>207501</v>
+                                    <v>207500</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35754,7 +35758,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>207501</v>
+                                    <v>207500</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36004,11 +36008,11 @@
         </relation>
         <relation>
             <name>stmtparents</name>
-            <cardinality>4053474</cardinality>
+            <cardinality>4053456</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4053474</v>
+                    <v>4053456</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -36016,7 +36020,7 @@
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>1719861</v>
+                    <v>1719854</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36030,7 +36034,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4053474</v>
+                                    <v>4053456</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36046,7 +36050,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4053474</v>
+                                    <v>4053456</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36184,17 +36188,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>987702</v>
+                                    <v>987697</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>372623</v>
+                                    <v>372621</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>105638</v>
+                                    <v>105637</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -36225,17 +36229,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>987702</v>
+                                    <v>987697</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>372623</v>
+                                    <v>372621</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>105638</v>
+                                    <v>105637</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -36260,11 +36264,11 @@
         </relation>
         <relation>
             <name>ishandler</name>
-            <cardinality>62676</cardinality>
+            <cardinality>62675</cardinality>
             <columnsizes>
                 <e>
                     <k>block</k>
-                    <v>62676</v>
+                    <v>62675</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -36297,7 +36301,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>520372</v>
+                                    <v>520373</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -36318,7 +36322,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>520372</v>
+                                    <v>520373</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -36578,7 +36582,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>520372</v>
+                                    <v>520373</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -36599,7 +36603,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>520372</v>
+                                    <v>520373</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -36833,15 +36837,15 @@
         </relation>
         <relation>
             <name>blockscope</name>
-            <cardinality>1410868</cardinality>
+            <cardinality>1410861</cardinality>
             <columnsizes>
                 <e>
                     <k>block</k>
-                    <v>1410868</v>
+                    <v>1410861</v>
                 </e>
                 <e>
                     <k>enclosing</k>
-                    <v>1295552</v>
+                    <v>1295546</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36855,7 +36859,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1410868</v>
+                                    <v>1410861</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36871,12 +36875,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1230191</v>
+                                    <v>1230185</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>13</b>
-                                    <v>65361</v>
+                                    <v>65360</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36886,15 +36890,15 @@
         </relation>
         <relation>
             <name>jumpinfo</name>
-            <cardinality>254457</cardinality>
+            <cardinality>254455</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>254457</v>
+                    <v>254455</v>
                 </e>
                 <e>
                     <k>str</k>
-                    <v>21191</v>
+                    <v>21190</v>
                 </e>
                 <e>
                     <k>target</k>
@@ -36912,7 +36916,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>254457</v>
+                                    <v>254455</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36928,7 +36932,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>254457</v>
+                                    <v>254455</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37072,19 +37076,19 @@
         </relation>
         <relation>
             <name>preprocdirects</name>
-            <cardinality>4190586</cardinality>
+            <cardinality>4191099</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4190586</v>
+                    <v>4191099</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>5135</v>
+                    <v>5136</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>4149969</v>
+                    <v>4150477</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37098,7 +37102,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4190586</v>
+                                    <v>4191099</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37114,7 +37118,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4190586</v>
+                                    <v>4191099</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37262,7 +37266,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4149502</v>
+                                    <v>4150010</v>
                                 </b>
                                 <b>
                                     <a>88</a>
@@ -37283,7 +37287,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4149969</v>
+                                    <v>4150477</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37293,15 +37297,15 @@
         </relation>
         <relation>
             <name>preprocpair</name>
-            <cardinality>1431410</cardinality>
+            <cardinality>1431585</cardinality>
             <columnsizes>
                 <e>
                     <k>begin</k>
-                    <v>1197043</v>
+                    <v>1197190</v>
                 </e>
                 <e>
                     <k>elseelifend</k>
-                    <v>1431410</v>
+                    <v>1431585</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37315,17 +37319,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>978550</v>
+                                    <v>978670</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>208222</v>
+                                    <v>208247</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>11</b>
-                                    <v>10271</v>
+                                    <v>10272</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37341,7 +37345,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1431410</v>
+                                    <v>1431585</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37351,41 +37355,41 @@
         </relation>
         <relation>
             <name>preproctrue</name>
-            <cardinality>767060</cardinality>
+            <cardinality>767154</cardinality>
             <columnsizes>
                 <e>
                     <k>branch</k>
-                    <v>767060</v>
+                    <v>767154</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>preprocfalse</name>
-            <cardinality>331474</cardinality>
+            <cardinality>331515</cardinality>
             <columnsizes>
                 <e>
                     <k>branch</k>
-                    <v>331474</v>
+                    <v>331515</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>preproctext</name>
-            <cardinality>3367747</cardinality>
+            <cardinality>3367732</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3367747</v>
+                    <v>3367732</v>
                 </e>
                 <e>
                     <k>head</k>
-                    <v>2440673</v>
+                    <v>2440662</v>
                 </e>
                 <e>
                     <k>body</k>
-                    <v>1426418</v>
+                    <v>1426412</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37399,7 +37403,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3367747</v>
+                                    <v>3367732</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37415,7 +37419,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3367747</v>
+                                    <v>3367732</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37431,12 +37435,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2301873</v>
+                                    <v>2301863</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>740</b>
-                                    <v>138800</v>
+                                    <v>138799</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37452,7 +37456,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2381962</v>
+                                    <v>2381951</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -37473,12 +37477,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1291263</v>
+                                    <v>1291258</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>106981</v>
+                                    <v>106980</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -37499,7 +37503,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1294120</v>
+                                    <v>1294114</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -37519,15 +37523,15 @@
         </relation>
         <relation>
             <name>includes</name>
-            <cardinality>313266</cardinality>
+            <cardinality>313305</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>313266</v>
+                    <v>313305</v>
                 </e>
                 <e>
                     <k>included</k>
-                    <v>117183</v>
+                    <v>117197</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37541,7 +37545,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>313266</v>
+                                    <v>313305</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37557,27 +37561,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>61159</v>
+                                    <v>61166</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>21942</v>
+                                    <v>21945</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>12605</v>
+                                    <v>12606</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>10271</v>
+                                    <v>10272</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>14</b>
-                                    <v>8870</v>
+                                    <v>8871</v>
                                 </b>
                                 <b>
                                     <a>14</a>
@@ -37640,11 +37644,11 @@
         </relation>
         <relation>
             <name>link_parent</name>
-            <cardinality>28676866</cardinality>
+            <cardinality>28676738</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
-                    <v>3584451</v>
+                    <v>3584435</v>
                 </e>
                 <e>
                     <k>link_target</k>
@@ -37662,7 +37666,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>432954</v>
+                                    <v>432952</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -37672,7 +37676,7 @@
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>3131152</v>
+                                    <v>3131138</v>
                                 </b>
                             </bs>
                         </hist>
diff --git a/cpp/ql/lib/upgrades/7ff6a6e53dbcff09d1b9b758b594bc6d17366863/old.dbscheme b/cpp/ql/lib/upgrades/7ff6a6e53dbcff09d1b9b758b594bc6d17366863/old.dbscheme
new file mode 100644
index 000000000000..7ff6a6e53dbc
--- /dev/null
+++ b/cpp/ql/lib/upgrades/7ff6a6e53dbcff09d1b9b758b594bc6d17366863/old.dbscheme
@@ -0,0 +1,2315 @@
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The 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
+);
+
+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_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable 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
+);
+
+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: @functionorblock 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
+   1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+|  5 = @typedef                       // classic C: typedef typedef type name
+|  6 = @template
+|  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                  // a using name = type style typedef
+;
+*/
+
+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
+);
+
+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
+);
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    unique int templ_param_id: @usertype 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
+);
+
+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;
+
+@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
+;
+
+@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
+            ;
+
+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
+);
+
+@runtime_sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof;
+
+sizeof_bind(
+    unique int expr: @runtime_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
+;
+
+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
+);
+
+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
+);
+
+@functionorblock = @function | @stmt_block;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @functionorblock 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
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif;
+
+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/7ff6a6e53dbcff09d1b9b758b594bc6d17366863/semmlecode.cpp.dbscheme b/cpp/ql/lib/upgrades/7ff6a6e53dbcff09d1b9b758b594bc6d17366863/semmlecode.cpp.dbscheme
new file mode 100644
index 000000000000..6f5d51e89e76
--- /dev/null
+++ b/cpp/ql/lib/upgrades/7ff6a6e53dbcff09d1b9b758b594bc6d17366863/semmlecode.cpp.dbscheme
@@ -0,0 +1,2316 @@
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The 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
+);
+
+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_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable 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
+);
+
+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: @functionorblock 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
+   1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+|  5 = @typedef                       // classic C: typedef typedef type name
+|  6 = @template
+|  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                  // a using name = type style typedef
+;
+*/
+
+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
+);
+
+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
+);
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    unique int templ_param_id: @usertype 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
+);
+
+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;
+
+@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
+;
+
+@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
+            ;
+
+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
+);
+
+@runtime_sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof;
+
+sizeof_bind(
+    unique int expr: @runtime_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
+;
+
+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
+);
+
+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
+);
+
+@functionorblock = @function | @stmt_block;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @functionorblock 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
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif;
+
+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/7ff6a6e53dbcff09d1b9b758b594bc6d17366863/upgrade.properties b/cpp/ql/lib/upgrades/7ff6a6e53dbcff09d1b9b758b594bc6d17366863/upgrade.properties
new file mode 100644
index 000000000000..dddc448b8e13
--- /dev/null
+++ b/cpp/ql/lib/upgrades/7ff6a6e53dbcff09d1b9b758b594bc6d17366863/upgrade.properties
@@ -0,0 +1,2 @@
+description: Add requires expressions
+compatibility: full
diff --git a/cpp/ql/src/Security/CWE/CWE-129/ImproperArrayIndexValidation.ql b/cpp/ql/src/Security/CWE/CWE-129/ImproperArrayIndexValidation.ql
index 107be7bddfde..b5dc4d893b21 100644
--- a/cpp/ql/src/Security/CWE/CWE-129/ImproperArrayIndexValidation.ql
+++ b/cpp/ql/src/Security/CWE/CWE-129/ImproperArrayIndexValidation.ql
@@ -14,102 +14,56 @@
 
 import cpp
 import semmle.code.cpp.controlflow.IRGuards
-import semmle.code.cpp.security.FlowSources
-import semmle.code.cpp.ir.dataflow.TaintTracking
-import semmle.code.cpp.rangeanalysis.RangeAnalysisUtils
+import semmle.code.cpp.security.FlowSources as FS
+import semmle.code.cpp.dataflow.new.TaintTracking
+import semmle.code.cpp.rangeanalysis.SimpleRangeAnalysis
 import ImproperArrayIndexValidation::PathGraph
-import semmle.code.cpp.security.Security
 
-predicate hasUpperBound(VariableAccess offsetExpr) {
-  exists(BasicBlock controlled, StackVariable offsetVar, SsaDefinition def |
-    controlled.contains(offsetExpr) and
-    linearBoundControls(controlled, def, offsetVar) and
-    offsetExpr = def.getAUse(offsetVar)
-  )
+predicate isFlowSource(FS::FlowSource source, string sourceType) {
+  sourceType = source.getSourceType()
 }
 
-pragma[noinline]
-predicate linearBoundControls(BasicBlock controlled, SsaDefinition def, StackVariable offsetVar) {
-  exists(GuardCondition guard, boolean branch |
-    guard.controls(controlled, branch) and
-    cmpWithLinearBound(guard, def.getAUse(offsetVar), Lesser(), branch)
+predicate guardChecks(IRGuardCondition g, Expr e, boolean branch) {
+  exists(Operand op | op.getDef().getConvertedResultExpression() = e |
+    // `op < k` is true and `k > 0`
+    g.comparesLt(op, any(int k | k > 0), true, any(BooleanValue bv | bv.getValue() = branch))
+    or
+    // `op < _ + k` is true and `k > 0`.
+    g.comparesLt(op, _, any(int k | k > 0), true, branch)
+    or
+    // op == k
+    g.comparesEq(op, _, true, any(BooleanValue bv | bv.getValue() = branch))
+    or
+    // op == _ + k
+    g.comparesEq(op, _, _, true, branch)
   )
 }
 
-predicate readsVariable(LoadInstruction load, Variable var) {
-  load.getSourceAddress().(VariableAddressInstruction).getAstVariable() = var
-}
-
-predicate hasUpperBoundsCheck(Variable var) {
-  exists(RelationalOperation oper, VariableAccess access |
-    oper.getAnOperand() = access and
-    access.getTarget() = var and
-    // Comparing to 0 is not an upper bound check
-    not oper.getAnOperand().getValue() = "0"
+/**
+ * Holds if `arrayExpr` accesses an `ArrayType` with a constant size `N`, and
+ * the value of `offsetExpr` is known to be smaller than `N`.
+ */
+predicate offsetIsAlwaysInBounds(ArrayExpr arrayExpr, VariableAccess offsetExpr) {
+  exists(ArrayType arrayType |
+    arrayType = arrayExpr.getArrayBase().getUnspecifiedType() and
+    arrayType.getArraySize() > upperBound(offsetExpr.getFullyConverted())
   )
 }
 
-predicate nodeIsBarrierEqualityCandidate(DataFlow::Node node, Operand access, Variable checkedVar) {
-  readsVariable(node.asInstruction(), checkedVar) and
-  any(IRGuardCondition guard).ensuresEq(access, _, _, node.asInstruction().getBlock(), true)
-}
-
-predicate isFlowSource(FlowSource source, string sourceType) { sourceType = source.getSourceType() }
-
-predicate predictableInstruction(Instruction instr) {
-  instr instanceof ConstantInstruction
-  or
-  instr instanceof StringConstantInstruction
-  or
-  // This could be a conversion on a string literal
-  predictableInstruction(instr.(UnaryInstruction).getUnary())
-}
-
 module ImproperArrayIndexValidationConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { isFlowSource(source, _) }
 
   predicate isBarrier(DataFlow::Node node) {
-    hasUpperBound(node.asExpr())
-    or
-    // These barriers are ported from `DefaultTaintTracking` because this query is quite noisy
-    // otherwise.
-    exists(Variable checkedVar |
-      readsVariable(node.asInstruction(), checkedVar) and
-      hasUpperBoundsCheck(checkedVar)
-    )
-    or
-    exists(Variable checkedVar, Operand access |
-      readsVariable(access.getDef(), checkedVar) and
-      nodeIsBarrierEqualityCandidate(node, access, checkedVar)
-    )
-    or
-    // Don't use dataflow into binary instructions if both operands are unpredictable
-    exists(BinaryInstruction iTo |
-      iTo = node.asInstruction() and
-      not predictableInstruction(iTo.getLeft()) and
-      not predictableInstruction(iTo.getRight()) and
-      // propagate taint from either the pointer or the offset, regardless of predictability
-      not iTo instanceof PointerArithmeticInstruction
-    )
-    or
-    // don't use dataflow through calls to pure functions if two or more operands
-    // are unpredictable
-    exists(Instruction iFrom1, Instruction iFrom2, CallInstruction iTo |
-      iTo = node.asInstruction() and
-      isPureFunction(iTo.getStaticCallTarget().getName()) and
-      iFrom1 = iTo.getAnArgument() and
-      iFrom2 = iTo.getAnArgument() and
-      not predictableInstruction(iFrom1) and
-      not predictableInstruction(iFrom2) and
-      iFrom1 != iFrom2
-    )
+    node = DataFlow::BarrierGuard<guardChecks/3>::getABarrierNode()
   }
 
+  predicate isBarrierOut(DataFlow::Node node) { isSink(node) }
+
   predicate isSink(DataFlow::Node sink) {
     exists(ArrayExpr arrayExpr, VariableAccess offsetExpr |
       offsetExpr = arrayExpr.getArrayOffset() and
       sink.asExpr() = offsetExpr and
-      not hasUpperBound(offsetExpr)
+      not offsetIsAlwaysInBounds(arrayExpr, offsetExpr)
     )
   }
 }
diff --git a/cpp/ql/src/change-notes/2024-10-07-unclear-array-index-validation.md b/cpp/ql/src/change-notes/2024-10-07-unclear-array-index-validation.md
new file mode 100644
index 000000000000..b237afdd6be8
--- /dev/null
+++ b/cpp/ql/src/change-notes/2024-10-07-unclear-array-index-validation.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* The `cpp/unclear-array-index-validation` ("Unclear validation of array index") query has been improved to reduce false positives increase true positives.
\ No newline at end of file
diff --git a/cpp/ql/test/library-tests/ir/ir/PrintAST.expected b/cpp/ql/test/library-tests/ir/ir/PrintAST.expected
index 986ce6dd158a..1e0ef80c269b 100644
--- a/cpp/ql/test/library-tests/ir/ir/PrintAST.expected
+++ b/cpp/ql/test/library-tests/ir/ir/PrintAST.expected
@@ -23564,6 +23564,26 @@ ir.cpp:
 # 2686|           Value = [CStyleCast] 0
 # 2686|           ValueCategory = prvalue
 # 2687|     getStmt(1): [ReturnStmt] return ...
+# 2691| [TopLevelFunction] int concepts::requires_use()
+# 2691|   <params>: 
+# 2691|   getEntryPoint(): [BlockStmt] { ... }
+# 2692|     getStmt(0): [DeclStmt] declaration
+# 2692|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of y
+# 2692|           Type = [IntType] int
+# 2692|         getVariable().getInitializer(): [Initializer] initializer for y
+#-----|           getExpr(): [RequiresExpr] requires ...
+#-----|               Type = [BoolType] bool
+#-----|               Value = [RequiresExpr] 1
+#-----|               ValueCategory = prvalue
+#-----|           getExpr().getFullyConverted(): [CStyleCast] (int)...
+#-----|               Conversion = [IntegralConversion] integral conversion
+#-----|               Type = [IntType] int
+#-----|               Value = [CStyleCast] 1
+#-----|               ValueCategory = prvalue
+# 2693|     getStmt(1): [ReturnStmt] return ...
+# 2693|       getExpr(): [VariableAccess] y
+# 2693|           Type = [IntType] int
+# 2693|           ValueCategory = prvalue(load)
 many-defs-per-use.cpp:
 #   34| [TopLevelFunction] void many_defs_per_use()
 #   34|   <params>: 
diff --git a/cpp/ql/test/library-tests/ir/ir/aliased_ir.expected b/cpp/ql/test/library-tests/ir/ir/aliased_ir.expected
index 57c806278672..9fcaf04382d3 100644
--- a/cpp/ql/test/library-tests/ir/ir/aliased_ir.expected
+++ b/cpp/ql/test/library-tests/ir/ir/aliased_ir.expected
@@ -19099,6 +19099,24 @@ ir.cpp:
 # 2684|   Block 8
 # 2684|     v2684_14(void) = Unreached : 
 
+# 2691| int concepts::requires_use()
+# 2691|   Block 0
+# 2691|     v2691_1(void)       = EnterFunction            : 
+# 2691|     m2691_2(unknown)    = AliasedDefinition        : 
+# 2691|     m2691_3(unknown)    = InitializeNonLocal       : 
+# 2691|     m2691_4(unknown)    = Chi                      : total:m2691_2, partial:m2691_3
+# 2692|     r2692_1(glval<int>) = VariableAddress[y]       : 
+#-----|     r0_1(int)           = Constant[1]              : 
+#-----|     m0_2(int)           = Store[y]                 : &:r2692_1, r0_1
+# 2693|     r2693_1(glval<int>) = VariableAddress[#return] : 
+# 2693|     r2693_2(glval<int>) = VariableAddress[y]       : 
+# 2693|     r2693_3(int)        = Load[y]                  : &:r2693_2, m0_2
+# 2693|     m2693_4(int)        = Store[#return]           : &:r2693_1, r2693_3
+# 2691|     r2691_5(glval<int>) = VariableAddress[#return] : 
+# 2691|     v2691_6(void)       = ReturnValue              : &:r2691_5, m2693_4
+# 2691|     v2691_7(void)       = AliasedUse               : m2691_3
+# 2691|     v2691_8(void)       = ExitFunction             : 
+
 many-defs-per-use.cpp:
 #   34| void many_defs_per_use()
 #   34|   Block 0
diff --git a/cpp/ql/test/library-tests/ir/ir/ir.cpp b/cpp/ql/test/library-tests/ir/ir/ir.cpp
index f8e163685373..105cdbf3ae65 100644
--- a/cpp/ql/test/library-tests/ir/ir/ir.cpp
+++ b/cpp/ql/test/library-tests/ir/ir/ir.cpp
@@ -2686,4 +2686,13 @@ void test(bool b)
   twice_call_use(b ? "" : "");
 }
 
+namespace concepts {
+
+int requires_use() {
+  int y = requires { sizeof(int) > 0; };
+  return y;
+}
+
+}
+
 // semmle-extractor-options: -std=c++20 --clang
diff --git a/cpp/ql/test/library-tests/ir/ir/raw_ir.expected b/cpp/ql/test/library-tests/ir/ir/raw_ir.expected
index a2d605daef17..ff4f47f3c22f 100644
--- a/cpp/ql/test/library-tests/ir/ir/raw_ir.expected
+++ b/cpp/ql/test/library-tests/ir/ir/raw_ir.expected
@@ -17422,6 +17422,23 @@ ir.cpp:
 # 2684|     v2684_7(void) = AliasedUse   : ~m?
 # 2684|     v2684_8(void) = ExitFunction : 
 
+# 2691| int concepts::requires_use()
+# 2691|   Block 0
+# 2691|     v2691_1(void)       = EnterFunction            : 
+# 2691|     mu2691_2(unknown)   = AliasedDefinition        : 
+# 2691|     mu2691_3(unknown)   = InitializeNonLocal       : 
+# 2692|     r2692_1(glval<int>) = VariableAddress[y]       : 
+#-----|     r0_1(int)           = Constant[1]              : 
+#-----|     mu0_2(int)          = Store[y]                 : &:r2692_1, r0_1
+# 2693|     r2693_1(glval<int>) = VariableAddress[#return] : 
+# 2693|     r2693_2(glval<int>) = VariableAddress[y]       : 
+# 2693|     r2693_3(int)        = Load[y]                  : &:r2693_2, ~m?
+# 2693|     mu2693_4(int)       = Store[#return]           : &:r2693_1, r2693_3
+# 2691|     r2691_4(glval<int>) = VariableAddress[#return] : 
+# 2691|     v2691_5(void)       = ReturnValue              : &:r2691_4, ~m?
+# 2691|     v2691_6(void)       = AliasedUse               : ~m?
+# 2691|     v2691_7(void)       = ExitFunction             : 
+
 many-defs-per-use.cpp:
 #   34| void many_defs_per_use()
 #   34|   Block 0
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected
index d6ffc7aed578..184af69e72c4 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected
@@ -2,29 +2,36 @@ edges
 | test1.c:7:26:7:29 | **argv | test1.c:8:11:8:14 | call to atoi | provenance | TaintFunction |
 | test1.c:8:11:8:14 | call to atoi | test1.c:9:9:9:9 | i | provenance |  |
 | test1.c:8:11:8:14 | call to atoi | test1.c:11:9:11:9 | i | provenance |  |
+| test1.c:8:11:8:14 | call to atoi | test1.c:12:9:12:9 | i | provenance |  |
 | test1.c:8:11:8:14 | call to atoi | test1.c:13:9:13:9 | i | provenance |  |
-| test1.c:9:9:9:9 | i | test1.c:16:16:16:16 | i | provenance |  |
-| test1.c:11:9:11:9 | i | test1.c:32:16:32:16 | i | provenance |  |
-| test1.c:13:9:13:9 | i | test1.c:48:16:48:16 | i | provenance |  |
-| test1.c:16:16:16:16 | i | test1.c:18:16:18:16 | i | provenance |  |
-| test1.c:32:16:32:16 | i | test1.c:33:11:33:11 | i | provenance |  |
-| test1.c:48:16:48:16 | i | test1.c:51:3:51:7 | ... = ... | provenance |  |
-| test1.c:51:3:51:7 | ... = ... | test1.c:53:15:53:15 | j | provenance |  |
+| test1.c:9:9:9:9 | i | test1.c:18:16:18:16 | i | provenance |  |
+| test1.c:11:9:11:9 | i | test1.c:34:16:34:16 | i | provenance |  |
+| test1.c:12:9:12:9 | i | test1.c:42:16:42:16 | i | provenance |  |
+| test1.c:13:9:13:9 | i | test1.c:50:16:50:16 | i | provenance |  |
+| test1.c:18:16:18:16 | i | test1.c:20:16:20:16 | i | provenance |  |
+| test1.c:34:16:34:16 | i | test1.c:35:11:35:11 | i | provenance |  |
+| test1.c:42:16:42:16 | i | test1.c:43:11:43:11 | i | provenance |  |
+| test1.c:50:16:50:16 | i | test1.c:53:3:53:7 | ... = ... | provenance |  |
+| test1.c:53:3:53:7 | ... = ... | test1.c:55:15:55:15 | j | provenance |  |
 nodes
 | test1.c:7:26:7:29 | **argv | semmle.label | **argv |
 | test1.c:8:11:8:14 | call to atoi | semmle.label | call to atoi |
 | test1.c:9:9:9:9 | i | semmle.label | i |
 | test1.c:11:9:11:9 | i | semmle.label | i |
+| test1.c:12:9:12:9 | i | semmle.label | i |
 | test1.c:13:9:13:9 | i | semmle.label | i |
-| test1.c:16:16:16:16 | i | semmle.label | i |
 | test1.c:18:16:18:16 | i | semmle.label | i |
-| test1.c:32:16:32:16 | i | semmle.label | i |
-| test1.c:33:11:33:11 | i | semmle.label | i |
-| test1.c:48:16:48:16 | i | semmle.label | i |
-| test1.c:51:3:51:7 | ... = ... | semmle.label | ... = ... |
-| test1.c:53:15:53:15 | j | semmle.label | j |
+| test1.c:20:16:20:16 | i | semmle.label | i |
+| test1.c:34:16:34:16 | i | semmle.label | i |
+| test1.c:35:11:35:11 | i | semmle.label | i |
+| test1.c:42:16:42:16 | i | semmle.label | i |
+| test1.c:43:11:43:11 | i | semmle.label | i |
+| test1.c:50:16:50:16 | i | semmle.label | i |
+| test1.c:53:3:53:7 | ... = ... | semmle.label | ... = ... |
+| test1.c:55:15:55:15 | j | semmle.label | j |
 subpaths
 #select
-| test1.c:18:16:18:16 | i | test1.c:7:26:7:29 | **argv | test1.c:18:16:18:16 | i | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
-| test1.c:33:11:33:11 | i | test1.c:7:26:7:29 | **argv | test1.c:33:11:33:11 | i | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
-| test1.c:53:15:53:15 | j | test1.c:7:26:7:29 | **argv | test1.c:53:15:53:15 | j | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
+| test1.c:20:16:20:16 | i | test1.c:7:26:7:29 | **argv | test1.c:20:16:20:16 | i | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
+| test1.c:35:11:35:11 | i | test1.c:7:26:7:29 | **argv | test1.c:35:11:35:11 | i | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
+| test1.c:43:11:43:11 | i | test1.c:7:26:7:29 | **argv | test1.c:43:11:43:11 | i | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
+| test1.c:55:15:55:15 | j | test1.c:7:26:7:29 | **argv | test1.c:55:15:55:15 | j | An array indexing expression depends on $@ that might be outside the bounds of the array. | test1.c:7:26:7:29 | **argv | a command-line argument |
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/test1.c b/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/test1.c
index 08484aef51fc..89619626de91 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/test1.c
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/test1.c
@@ -11,6 +11,8 @@ int main(int argc, char *argv[]) {
   test3(i);
   test4(i);
   test5(i);
+  test6(i);
+  test7(argv[1]);
 }
 
 void test1(int i) {
@@ -38,7 +40,7 @@ void test3(int i) {
 }
 
 void test4(int i) {
-  myArray[i] = 0; // BAD: i has not been validated [NOT REPORTED]
+  myArray[i] = 0; // BAD: i has not been validated
 
   if ((i < 0) || (i >= 10)) return;
 
@@ -52,3 +54,26 @@ void test5(int i) {
 
   j = myArray[j]; // BAD: j has not been validated
 }
+
+extern int myTable[256];
+
+void test6(int i) {
+  unsigned char s = i;
+
+  myTable[s] = 0; // GOOD: Input is small [FALSE POSITIVE]
+}
+
+typedef void FILE;
+#define EOF (-1)
+
+int getc(FILE*);
+
+extern int myMaxCharTable[256];
+
+void test7(FILE* fp) {
+  int ch;
+  while ((ch = getc(fp)) != EOF) {
+    myMaxCharTable[ch] = 0; // GOOD
+  }
+}
+
diff --git a/csharp/ql/test/utils/modelgenerator/dataflow/Summaries.cs b/csharp/ql/test/utils/modelgenerator/dataflow/Summaries.cs
index d7256b1019c4..473144358f47 100644
--- a/csharp/ql/test/utils/modelgenerator/dataflow/Summaries.cs
+++ b/csharp/ql/test/utils/modelgenerator/dataflow/Summaries.cs
@@ -639,7 +639,7 @@ public DImpl(string s)
         public override string Prop { get { return tainted; } }
     }
 
-    public abstract class BaseContent 
+    public abstract class BaseContent
     {
         public abstract object GetValue();
 
@@ -961,3 +961,30 @@ public string ConcatValueOnBase2(string other, Base2 b2)
         return other + b2.GetValue();
     }
 }
+
+public class AvoidDuplicateLifted
+{
+    public class A
+    {
+        public object Prop { get; set; }
+
+        // contentbased-summary=Models;AvoidDuplicateLifted+A;true;GetValue;();;Argument[this].Property[Models.AvoidDuplicateLifted+A.Prop];ReturnValue;value;dfc-generated
+        // summary=Models;AvoidDuplicateLifted+A;true;GetValue;();;Argument[this];ReturnValue;taint;df-generated
+        public virtual object GetValue()
+        {
+            return Prop;
+        }
+    }
+
+    public class B : A
+    {
+        private object field;
+
+        // No content based summary as field is a dead synthetic field.
+        // summary=Models;AvoidDuplicateLifted+A;true;GetValue;();;Argument[this];ReturnValue;taint;df-generated
+        public override object GetValue()
+        {
+            return field;
+        }
+    }
+}
diff --git a/rust/ql/consistency-queries/AstConsistency.ql b/rust/ql/consistency-queries/AstConsistency.ql
new file mode 100644
index 000000000000..2187f53b61fe
--- /dev/null
+++ b/rust/ql/consistency-queries/AstConsistency.ql
@@ -0,0 +1,21 @@
+import rust
+import codeql.rust.elements.internal.generated.ParentChild
+
+query predicate multipleToString(Element e, string s) {
+  s = strictconcat(e.toString(), ",") and
+  strictcount(e.toString()) > 1
+}
+
+query predicate multipleLocations(Locatable e) { strictcount(e.getLocation()) > 1 }
+
+query predicate multiplePrimaryQlClasses(Element e, string s) {
+  s = e.getPrimaryQlClasses() and
+  strictcount(e.getAPrimaryQlClass()) > 1
+}
+
+private Element getParent(Element child) { child = getChildAndAccessor(result, _, _) }
+
+query predicate multipleParents(Element child, Element parent) {
+  parent = getParent(child) and
+  strictcount(getParent(child)) > 1
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
index b9e9bb7cb48a..7c387c966281 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
@@ -1,6 +1,7 @@
 private import rust
 private import codeql.rust.elements.internal.generated.ParentChild
 private import codeql.rust.elements.internal.PathExprImpl::Impl as PathExprImpl
+private import codeql.util.DenseRank
 
 module Impl {
   /**
@@ -77,7 +78,12 @@ module Impl {
       not exists(getOutermostEnclosingOrPat(p)) and
       definingNode = p.getName()
     ) and
-    name = p.getName().getText()
+    name = p.getName().getText() and
+    // exclude for now anything starting with an uppercase character, which may be a reference to
+    // an enum constant (e.g. `None`). This excludes static and constant variables (UPPERCASE),
+    // which we don't appear to recognize yet anyway. This also assumes programmers follow the
+    // naming guidelines, which they generally do, but they're not enforced.
+    not name.charAt(0).isUppercase()
   }
 
   /** A variable. */
@@ -119,6 +125,9 @@ module Impl {
         result = let.getInitializer()
       )
     }
+
+    /** Holds if this variable is captured. */
+    predicate isCaptured() { this.getAnAccess().isCapture() }
   }
 
   /** A path expression that may access a local variable. */
@@ -251,7 +260,7 @@ module Impl {
       // Use the location of the inner scope as the location of the access, instead of the
       // actual access location. This allows us to collapse multiple accesses in inner
       // scopes to a single entity
-      scope.getLocation().hasLocationInfo(_, startline, startcolumn, endline, endcolumn)
+      inner.getLocation().hasLocationInfo(_, startline, startcolumn, endline, endcolumn)
     )
   }
 
@@ -334,18 +343,30 @@ module Impl {
     }
   }
 
+  private module DenseRankInput implements DenseRankInputSig3 {
+    class C1 = VariableScope;
+
+    class C2 = string;
+
+    class Ranked = VariableOrAccessCand;
+
+    int getRank(VariableScope scope, string name, VariableOrAccessCand v) {
+      v =
+        rank[result](VariableOrAccessCand v0, int startline, int startcolumn, int endline,
+          int endcolumn |
+          v0.rankBy(name, scope, startline, startcolumn, endline, endcolumn)
+        |
+          v0 order by startline, startcolumn, endline, endcolumn
+        )
+    }
+  }
+
   /**
    * Gets the rank of `v` amongst all other declarations or access candidates
    * to a variable named `name` in the variable scope `scope`.
    */
   private int rankVariableOrAccess(VariableScope scope, string name, VariableOrAccessCand v) {
-    v =
-      rank[result + 1](VariableOrAccessCand v0, int startline, int startcolumn, int endline,
-        int endcolumn |
-        v0.rankBy(name, scope, startline, startcolumn, endline, endcolumn)
-      |
-        v0 order by startline, startcolumn, endline, endcolumn
-      )
+    result = DenseRank3<DenseRankInput>::denseRank(scope, name, v) - 1
   }
 
   /**
@@ -379,16 +400,21 @@ module Impl {
     )
   }
 
+  private import codeql.rust.controlflow.internal.Scope
+
   /** A variable access. */
   class VariableAccess extends PathExprImpl::PathExpr instanceof VariableAccessCand {
     private string name;
     private Variable v;
 
-    VariableAccess() { variableAccess(_, name, v, this) }
+    VariableAccess() { variableAccess(name, v, this) }
 
     /** Gets the variable being accessed. */
     Variable getVariable() { result = v }
 
+    /** Holds if this access is a capture. */
+    predicate isCapture() { scopeOfAst(this) != scopeOfAst(v.getPat()) }
+
     override string toString() { result = name }
 
     override string getAPrimaryQlClass() { result = "VariableAccess" }
@@ -426,10 +452,10 @@ module Impl {
       MkVariable(AstNode definingNode, string name) { variableDecl(definingNode, _, name) }
 
     cached
-    predicate variableAccess(VariableScope scope, string name, Variable v, VariableAccessCand cand) {
+    predicate variableAccess(string name, Variable v, VariableAccessCand cand) {
       v =
         min(Variable v0, int nestLevel |
-          variableReachesCand(scope, name, v0, cand, nestLevel)
+          variableReachesCand(_, name, v0, cand, nestLevel)
         |
           v0 order by nestLevel
         )
diff --git a/rust/ql/lib/codeql/rust/printast/PrintAst.qll b/rust/ql/lib/codeql/rust/printast/PrintAst.qll
index b485efe8022b..7b4e4fea68a8 100644
--- a/rust/ql/lib/codeql/rust/printast/PrintAst.qll
+++ b/rust/ql/lib/codeql/rust/printast/PrintAst.qll
@@ -2,48 +2,51 @@
  * Provides queries to pretty-print a Rust AST as a graph.
  */
 
-import PrintAstNode
+import codeql.rust.printast.PrintAstNode
 
-cached
-private int getOrder(PrintAstNode node) {
-  node =
-    rank[result](PrintAstNode n, Location loc |
-      loc = n.getLocation()
-    |
-      n
-      order by
-        loc.getFile().getAbsolutePath(), loc.getStartLine(), loc.getStartColumn(), loc.getEndLine(),
-        loc.getEndColumn()
-    )
-}
+module PrintAst<shouldPrintSig/1 shouldPrint> {
+  import PrintAstNode<shouldPrint/1>
+
+  pragma[nomagic]
+  private predicate orderBy(
+    PrintAstNode n, string filepath, int startline, int startcolumn, int endline, int endcolumn
+  ) {
+    n.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
+  }
 
-/** Holds if `node` belongs to the output tree, and its property `key` has the given `value`. */
-query predicate nodes(PrintAstNode node, string key, string value) {
-  node.shouldBePrinted() and
-  (
+  private int getOrder(PrintAstNode node) {
+    node =
+      rank[result](PrintAstNode n, string filepath, int startline, int startcolumn, int endline,
+        int endcolumn |
+        orderBy(n, filepath, startline, startcolumn, endline, endcolumn)
+      |
+        n order by filepath, startline, startcolumn, endline, endcolumn
+      )
+  }
+
+  /** Holds if `node` belongs to the output tree, and its property `key` has the given `value`. */
+  query predicate nodes(PrintAstNode node, string key, string value) {
     key = "semmle.label" and value = node.toString()
     or
     key = "semmle.order" and value = getOrder(node).toString()
     or
     value = node.getProperty(key)
-  )
-}
+  }
 
-/**
- * Holds if `target` is a child of `source` in the AST, and property `key` of the edge has the
- * given `value`.
- */
-query predicate edges(PrintAstNode source, PrintAstNode target, string key, string value) {
-  source.shouldBePrinted() and
-  target.shouldBePrinted() and
-  exists(int index, string accessor | source.hasChild(target, index, accessor) |
-    key = "semmle.label" and value = accessor
-    or
-    key = "semmle.order" and value = index.toString()
-  )
-}
+  /**
+   * Holds if `target` is a child of `source` in the AST, and property `key` of the edge has the
+   * given `value`.
+   */
+  query predicate edges(PrintAstNode source, PrintAstNode target, string key, string value) {
+    exists(int index, string accessor | source.hasChild(target, index, accessor) |
+      key = "semmle.label" and value = accessor
+      or
+      key = "semmle.order" and value = index.toString()
+    )
+  }
 
-/** Holds if property `key` of the graph has the given `value`. */
-query predicate graphProperties(string key, string value) {
-  key = "semmle.graphKind" and value = "tree"
+  /** Holds if property `key` of the graph has the given `value`. */
+  query predicate graphProperties(string key, string value) {
+    key = "semmle.graphKind" and value = "tree"
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/printast/PrintAstNode.qll b/rust/ql/lib/codeql/rust/printast/PrintAstNode.qll
index db5afa9b708c..3ba4360ada22 100644
--- a/rust/ql/lib/codeql/rust/printast/PrintAstNode.qll
+++ b/rust/ql/lib/codeql/rust/printast/PrintAstNode.qll
@@ -6,105 +6,81 @@
 import rust
 import codeql.rust.elements.internal.generated.ParentChild
 
-private newtype TPrintAstConfiguration = TMakePrintAstConfiguration()
+signature predicate shouldPrintSig(Locatable e);
 
-/**
- * The hook to customize the files and functions printed by this module.
- */
-class PrintAstConfiguration extends TPrintAstConfiguration {
+module PrintAstNode<shouldPrintSig/1 shouldPrint> {
   /**
-   * Gets the string representation of this singleton
+   * An AST node that should be printed.
    */
-  string toString() { result = "PrintAstConfiguration" }
+  private newtype TPrintAstNode = TPrintLocatable(Locatable ast) { shouldPrint(ast) }
 
   /**
-   * Holds if the AST for `e` should be printed. By default, holds for all.
+   * A node in the output tree.
    */
-  predicate shouldPrint(Locatable e) { any() }
-}
-
-private predicate shouldPrint(Locatable e) { any(PrintAstConfiguration config).shouldPrint(e) }
-
-/**
- * An AST node that should be printed.
- */
-private newtype TPrintAstNode = TPrintLocatable(Locatable ast)
-
-/**
- * A node in the output tree.
- */
-class PrintAstNode extends TPrintAstNode {
-  /**
-   * Gets a textual representation of this node.
-   */
-  abstract string toString();
-
-  /**
-   * Gets the child node at index `index`. Child indices must be unique,
-   * but need not be contiguous.
-   */
-  abstract predicate hasChild(PrintAstNode child, int index, string label);
-
-  /**
-   * Holds if this node should be printed in the output.
-   */
-  abstract predicate shouldBePrinted();
+  class PrintAstNode extends TPrintAstNode {
+    /**
+     * Gets a textual representation of this node.
+     */
+    abstract string toString();
+
+    /**
+     * Gets the child node at index `index`. Child indices must be unique,
+     * but need not be contiguous.
+     */
+    abstract predicate hasChild(PrintAstNode child, int index, string label);
+
+    /**
+     * Gets the location of this node in the source code.
+     */
+    abstract Location getLocation();
+
+    /**
+     * Gets the value of an additional property of this node, where the name of
+     * the property is `key`.
+     */
+    string getProperty(string key) { none() }
+
+    /**
+     * Gets the underlying AST node, if any.
+     */
+    abstract Locatable getAstNode();
+  }
 
-  /**
-   * Gets the location of this node in the source code.
-   */
-  abstract Location getLocation();
+  private string prettyPrint(Locatable e) { result = "[" + e.getPrimaryQlClasses() + "] " + e }
 
-  /**
-   * Gets the value of an additional property of this node, where the name of
-   * the property is `key`.
-   */
-  string getProperty(string key) { none() }
+  private class Unresolved extends Locatable {
+    Unresolved() { this != this.resolve() }
+  }
 
   /**
-   * Gets the underlying AST node, if any.
+   * A graph node representing a real Locatable node.
    */
-  abstract Locatable getAstNode();
-}
+  class PrintLocatable extends PrintAstNode, TPrintLocatable {
+    Locatable ast;
 
-private string prettyPrint(Locatable e) {
-  result = "[" + concat(e.getPrimaryQlClasses(), ", ") + "] " + e
-}
+    PrintLocatable() { this = TPrintLocatable(ast) }
 
-private class Unresolved extends Locatable {
-  Unresolved() { this != this.resolve() }
-}
+    override string toString() { result = prettyPrint(ast) }
 
-/**
- * A graph node representing a real Locatable node.
- */
-class PrintLocatable extends PrintAstNode, TPrintLocatable {
-  Locatable ast;
+    override predicate hasChild(PrintAstNode child, int index, string label) {
+      child = TPrintLocatable(any(Locatable c | c = getChildAndAccessor(ast, index, label)))
+    }
 
-  PrintLocatable() { this = TPrintLocatable(ast) }
+    final override Locatable getAstNode() { result = ast }
 
-  override string toString() { result = prettyPrint(ast) }
-
-  final override predicate shouldBePrinted() { shouldPrint(ast) }
-
-  override predicate hasChild(PrintAstNode child, int index, string label) {
-    child = TPrintLocatable(any(Locatable c | c = getChildAndAccessor(ast, index, label)))
+    final override Location getLocation() { result = ast.getLocation() }
   }
 
-  final override Locatable getAstNode() { result = ast }
-
-  final override Location getLocation() { result = ast.getLocation() }
-}
-
-/**
- * A specialization of graph node for "unresolved" children, that is nodes in
- * the parallel conversion AST.
- */
-class PrintUnresolved extends PrintLocatable {
-  override Unresolved ast;
+  /**
+   * A specialization of graph node for "unresolved" children, that is nodes in
+   * the parallel conversion AST.
+   */
+  class PrintUnresolved extends PrintLocatable {
+    override Unresolved ast;
 
-  override predicate hasChild(PrintAstNode child, int index, string label) {
-    // only print immediate unresolved children from the "parallel" AST
-    child = TPrintLocatable(getImmediateChildAndAccessor(ast, index, label).(Unresolved))
+    override predicate hasChild(PrintAstNode child, int index, string label) {
+      // only print immediate unresolved children from the "parallel" AST
+      child = TPrintLocatable(getImmediateChildAndAccessor(ast, index, label).(Unresolved))
+    }
   }
 }
diff --git a/rust/ql/src/queries/ide-contextual-queries/printAst.ql b/rust/ql/src/queries/ide-contextual-queries/printAst.ql
index 2362a206a34d..f878530c47c0 100644
--- a/rust/ql/src/queries/ide-contextual-queries/printAst.ql
+++ b/rust/ql/src/queries/ide-contextual-queries/printAst.ql
@@ -17,17 +17,10 @@ import codeql.rust.elements.internal.generated.ParentChild
  */
 external string selectedSourceFile();
 
-class PrintAstConfigurationOverride extends PrintAstConfiguration {
-  /**
-   * Holds if the location matches the selected file in the VS Code extension and
-   * the element is `e`.
-   */
-  override predicate shouldPrint(Locatable e) {
-    super.shouldPrint(e) and
-    (
-      e.getFile() = getFileBySourceArchiveName(selectedSourceFile())
-      or
-      exists(Locatable parent | this.shouldPrint(parent) and parent = getImmediateParent(e))
-    )
-  }
+predicate shouldPrint(Locatable e) {
+  e.getFile() = getFileBySourceArchiveName(selectedSourceFile())
+  or
+  exists(Locatable parent | shouldPrint(parent) and parent = getImmediateParent(e))
 }
+
+import PrintAst<shouldPrint/1>
diff --git a/rust/ql/src/queries/unusedentities/UnreachableCode.qhelp b/rust/ql/src/queries/unusedentities/UnreachableCode.qhelp
new file mode 100644
index 000000000000..fef1aa71f6ba
--- /dev/null
+++ b/rust/ql/src/queries/unusedentities/UnreachableCode.qhelp
@@ -0,0 +1,24 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+
+<overview>
+<p>This rule finds code that is never reached. Unused code should be removed to increase readability and avoid confusion.</p>
+</overview>
+
+<recommendation>
+<p>Remove any unreachable code.</p>
+</recommendation>
+
+<example>
+<p>In the following example, the final <code>return</code> statement can never be reached:</p>
+<sample src="UnreachableCodeBad.rs" />
+<p>The problem can be fixed simply by removing the unreachable code:</p>
+<sample src="UnreachableCodeGood.rs" />
+</example>
+
+<references>
+<li>Wikipedia: <a href="https://en.wikipedia.org/wiki/Unreachable_code">Unreachable code</a></li>
+</references>
+</qhelp>
diff --git a/rust/ql/src/queries/unusedentities/UnreachableCode.ql b/rust/ql/src/queries/unusedentities/UnreachableCode.ql
new file mode 100644
index 000000000000..f07ab0f982a2
--- /dev/null
+++ b/rust/ql/src/queries/unusedentities/UnreachableCode.ql
@@ -0,0 +1,75 @@
+/**
+ * @name Unreachable code
+ * @description Code that cannot be reached should be deleted.
+ * @kind problem
+ * @problem.severity recommendation
+ * @precision medium
+ * @id rust/dead-code
+ * @tags maintainability
+ */
+
+import rust
+import codeql.rust.controlflow.ControlFlowGraph
+import codeql.rust.controlflow.internal.ControlFlowGraphImpl as ControlFlowGraphImpl
+
+/**
+ * Holds if `n` is an AST node that's unreachable.
+ */
+private predicate unreachable(AstNode n) {
+  not n = any(CfgNode cfn).getAstNode() and // reachable nodes
+  exists(ControlFlowGraphImpl::ControlFlowTree cft |
+    // nodes intended to be part of the CFG
+    cft.succ(n, _, _)
+    or
+    cft.succ(_, n, _)
+  )
+}
+
+/**
+ * Holds if `n` is an AST node that's unreachable, and is not the successor
+ * of an unreachable node (which would be a duplicate result).
+ */
+private predicate firstUnreachable(AstNode n) {
+  unreachable(n) and
+  (
+    // no predecessor -> we are the first unreachable node.
+    not ControlFlowGraphImpl::succ(_, n, _)
+    or
+    // reachable predecessor -> we are the first unreachable node.
+    exists(AstNode pred |
+      ControlFlowGraphImpl::succ(pred, n, _) and
+      not unreachable(pred)
+    )
+  )
+}
+
+/**
+ * Gets a node we'd prefer not to report as unreachable.
+ */
+predicate skipNode(AstNode n) {
+  n instanceof ControlFlowGraphImpl::PostOrderTree or // location is counter-intuitive
+  not n instanceof ControlFlowGraphImpl::ControlFlowTree // not expected to be reachable
+}
+
+/**
+ * Gets the `ControlFlowTree` successor of a node we'd prefer not to report.
+ */
+AstNode skipSuccessor(AstNode n) {
+  skipNode(n) and
+  ControlFlowGraphImpl::succ(n, result, _)
+}
+
+/**
+ * Gets the node `n`, skipping past any nodes we'd prefer not to report.
+ */
+AstNode skipSuccessors(AstNode n) {
+  result = skipSuccessor*(n) and
+  not skipNode(result)
+}
+
+from AstNode first, AstNode report
+where
+  firstUnreachable(first) and
+  report = skipSuccessors(first) and
+  exists(report.getFile().getRelativePath()) // in source
+select report, "This code is never reached."
diff --git a/rust/ql/src/queries/unusedentities/UnreachableCodeBad.rs b/rust/ql/src/queries/unusedentities/UnreachableCodeBad.rs
new file mode 100644
index 000000000000..a27bc0cab164
--- /dev/null
+++ b/rust/ql/src/queries/unusedentities/UnreachableCodeBad.rs
@@ -0,0 +1,11 @@
+fn fib(input: u32) -> u32 {
+	if (input == 0) {
+		return 0;
+	} else if (input == 1) {
+		return 1;
+	} else {
+		return fib(input - 1) + fib(input - 2);
+	}
+
+	return input; // BAD: this code is never reached
+}
diff --git a/rust/ql/src/queries/unusedentities/UnreachableCodeGood.rs b/rust/ql/src/queries/unusedentities/UnreachableCodeGood.rs
new file mode 100644
index 000000000000..0b2bde66fe95
--- /dev/null
+++ b/rust/ql/src/queries/unusedentities/UnreachableCodeGood.rs
@@ -0,0 +1,9 @@
+fn fib(input: u32) -> u32 {
+	if (input == 0) {
+		return 0;
+	} else if (input == 1) {
+		return 1;
+	} else {
+		return fib(input - 1) + fib(input - 2);
+	}
+}
diff --git a/rust/ql/test/library-tests/controlflow/Cfg.expected b/rust/ql/test/library-tests/controlflow/Cfg.expected
index 61b71f15118d..036dca8af5a3 100644
--- a/rust/ql/test/library-tests/controlflow/Cfg.expected
+++ b/rust/ql/test/library-tests/controlflow/Cfg.expected
@@ -20,32 +20,32 @@ edges
 | test.rs:10:9:22:9 | ExprStmt | test.rs:11:13:11:24 | ExprStmt |  |
 | test.rs:10:9:22:9 | LoopExpr | test.rs:23:9:23:20 | ExprStmt |  |
 | test.rs:10:14:22:9 | BlockExpr | test.rs:11:13:11:24 | ExprStmt |  |
-| test.rs:11:13:11:13 | PathExpr | test.rs:11:17:11:20 | PathExpr |  |
+| test.rs:11:13:11:13 | i | test.rs:11:17:11:20 | PathExpr |  |
 | test.rs:11:13:11:23 | ... = ... | test.rs:12:13:14:13 | ExprStmt |  |
-| test.rs:11:13:11:24 | ExprStmt | test.rs:11:13:11:13 | PathExpr |  |
-| test.rs:11:17:11:20 | PathExpr | test.rs:11:22:11:22 | PathExpr |  |
+| test.rs:11:13:11:24 | ExprStmt | test.rs:11:13:11:13 | i |  |
+| test.rs:11:17:11:20 | PathExpr | test.rs:11:22:11:22 | i |  |
 | test.rs:11:17:11:23 | CallExpr | test.rs:11:13:11:23 | ... = ... |  |
-| test.rs:11:22:11:22 | PathExpr | test.rs:11:17:11:23 | CallExpr |  |
-| test.rs:12:13:14:13 | ExprStmt | test.rs:12:16:12:16 | PathExpr |  |
+| test.rs:11:22:11:22 | i | test.rs:11:17:11:23 | CallExpr |  |
+| test.rs:12:13:14:13 | ExprStmt | test.rs:12:16:12:16 | i |  |
 | test.rs:12:13:14:13 | IfExpr | test.rs:15:13:17:13 | ExprStmt |  |
-| test.rs:12:16:12:16 | PathExpr | test.rs:12:20:12:24 | 10000 |  |
+| test.rs:12:16:12:16 | i | test.rs:12:20:12:24 | 10000 |  |
 | test.rs:12:16:12:24 | ... > ... | test.rs:12:13:14:13 | IfExpr | false |
 | test.rs:12:16:12:24 | ... > ... | test.rs:13:17:13:29 | ExprStmt | true |
 | test.rs:12:20:12:24 | 10000 | test.rs:12:16:12:24 | ... > ... |  |
 | test.rs:13:17:13:28 | ReturnExpr | test.rs:8:5:24:5 | exit test_break_and_continue (normal) | return |
 | test.rs:13:17:13:29 | ExprStmt | test.rs:13:24:13:28 | false |  |
 | test.rs:13:24:13:28 | false | test.rs:13:17:13:28 | ReturnExpr |  |
-| test.rs:15:13:17:13 | ExprStmt | test.rs:15:16:15:16 | PathExpr |  |
+| test.rs:15:13:17:13 | ExprStmt | test.rs:15:16:15:16 | i |  |
 | test.rs:15:13:17:13 | IfExpr | test.rs:18:13:20:13 | ExprStmt |  |
-| test.rs:15:16:15:16 | PathExpr | test.rs:15:21:15:21 | 1 |  |
+| test.rs:15:16:15:16 | i | test.rs:15:21:15:21 | 1 |  |
 | test.rs:15:16:15:21 | ... == ... | test.rs:15:13:17:13 | IfExpr | false |
 | test.rs:15:16:15:21 | ... == ... | test.rs:16:17:16:22 | ExprStmt | true |
 | test.rs:15:21:15:21 | 1 | test.rs:15:16:15:21 | ... == ... |  |
 | test.rs:16:17:16:21 | BreakExpr | test.rs:10:9:22:9 | LoopExpr | break |
 | test.rs:16:17:16:22 | ExprStmt | test.rs:16:17:16:21 | BreakExpr |  |
-| test.rs:18:13:20:13 | ExprStmt | test.rs:18:16:18:16 | PathExpr |  |
-| test.rs:18:13:20:13 | IfExpr | test.rs:21:13:21:13 | PathExpr |  |
-| test.rs:18:16:18:16 | PathExpr | test.rs:18:20:18:20 | 2 |  |
+| test.rs:18:13:20:13 | ExprStmt | test.rs:18:16:18:16 | i |  |
+| test.rs:18:13:20:13 | IfExpr | test.rs:21:13:21:13 | i |  |
+| test.rs:18:16:18:16 | i | test.rs:18:20:18:20 | 2 |  |
 | test.rs:18:16:18:20 | ... % ... | test.rs:18:25:18:25 | 0 |  |
 | test.rs:18:16:18:25 | ... != ... | test.rs:18:13:20:13 | IfExpr | false |
 | test.rs:18:16:18:25 | ... != ... | test.rs:19:17:19:25 | ExprStmt | true |
@@ -53,9 +53,9 @@ edges
 | test.rs:18:25:18:25 | 0 | test.rs:18:16:18:25 | ... != ... |  |
 | test.rs:19:17:19:24 | ContinueExpr | test.rs:11:13:11:24 | ExprStmt | continue |
 | test.rs:19:17:19:25 | ExprStmt | test.rs:19:17:19:24 | ContinueExpr |  |
-| test.rs:21:13:21:13 | PathExpr | test.rs:21:17:21:17 | PathExpr |  |
+| test.rs:21:13:21:13 | i | test.rs:21:17:21:17 | i |  |
 | test.rs:21:13:21:21 | ... = ... | test.rs:10:14:22:9 | BlockExpr |  |
-| test.rs:21:17:21:17 | PathExpr | test.rs:21:21:21:21 | 2 |  |
+| test.rs:21:17:21:17 | i | test.rs:21:21:21:21 | 2 |  |
 | test.rs:21:17:21:21 | ... / ... | test.rs:21:13:21:21 | ... = ... |  |
 | test.rs:21:21:21:21 | 2 | test.rs:21:17:21:21 | ... / ... |  |
 | test.rs:23:9:23:19 | ReturnExpr | test.rs:8:5:24:5 | exit test_break_and_continue (normal) | return |
@@ -134,9 +134,9 @@ edges
 | test.rs:72:21:72:21 | 0 | test.rs:72:17:72:21 | ... > ... |  |
 | test.rs:73:17:73:21 | BreakExpr | test.rs:70:9:76:9 | WhileExpr | break |
 | test.rs:73:17:73:22 | ExprStmt | test.rs:73:17:73:21 | BreakExpr |  |
-| test.rs:75:13:75:13 | PathExpr | test.rs:75:17:75:21 | false |  |
+| test.rs:75:13:75:13 | b | test.rs:75:17:75:21 | false |  |
 | test.rs:75:13:75:21 | ... = ... | test.rs:70:17:76:9 | BlockExpr |  |
-| test.rs:75:13:75:22 | ExprStmt | test.rs:75:13:75:13 | PathExpr |  |
+| test.rs:75:13:75:22 | ExprStmt | test.rs:75:13:75:13 | b |  |
 | test.rs:75:17:75:21 | false | test.rs:75:13:75:21 | ... = ... |  |
 | test.rs:79:5:86:5 | enter test_while_let | test.rs:80:9:80:29 | LetStmt |  |
 | test.rs:79:5:86:5 | exit test_while_let (normal) | test.rs:79:5:86:5 | exit test_while_let |  |
@@ -230,13 +230,13 @@ edges
 | test.rs:122:28:124:9 | BlockExpr | test.rs:122:9:124:9 | IfExpr |  |
 | test.rs:123:13:123:13 | n | test.rs:122:28:124:9 | BlockExpr |  |
 | test.rs:125:9:125:9 | 0 | test.rs:121:43:126:5 | BlockExpr |  |
-| test.rs:128:5:134:5 | enter test_nested_if | test.rs:129:16:129:16 | PathExpr |  |
+| test.rs:128:5:134:5 | enter test_nested_if | test.rs:129:16:129:16 | a |  |
 | test.rs:128:5:134:5 | exit test_nested_if (normal) | test.rs:128:5:134:5 | exit test_nested_if |  |
 | test.rs:128:38:134:5 | BlockExpr | test.rs:128:5:134:5 | exit test_nested_if (normal) |  |
 | test.rs:129:9:133:9 | IfExpr | test.rs:128:38:134:5 | BlockExpr |  |
 | test.rs:129:13:129:48 | [boolean(false)] IfExpr | test.rs:132:13:132:13 | 0 | false |
 | test.rs:129:13:129:48 | [boolean(true)] IfExpr | test.rs:130:13:130:13 | 1 | true |
-| test.rs:129:16:129:16 | PathExpr | test.rs:129:20:129:20 | 0 |  |
+| test.rs:129:16:129:16 | a | test.rs:129:20:129:20 | 0 |  |
 | test.rs:129:16:129:20 | ... < ... | test.rs:129:24:129:24 | a | true |
 | test.rs:129:16:129:20 | ... < ... | test.rs:129:41:129:41 | a | false |
 | test.rs:129:20:129:20 | 0 | test.rs:129:16:129:20 | ... < ... |  |
diff --git a/rust/ql/test/library-tests/variables/Cfg.expected b/rust/ql/test/library-tests/variables/Cfg.expected
index 55b09cf6ace7..89e7aaec297e 100644
--- a/rust/ql/test/library-tests/variables/Cfg.expected
+++ b/rust/ql/test/library-tests/variables/Cfg.expected
@@ -602,90 +602,142 @@ edges
 | variables.rs:354:5:354:16 | CallExpr | variables.rs:351:17:355:1 | BlockExpr |  |
 | variables.rs:354:5:354:17 | ExprStmt | variables.rs:354:5:354:13 | PathExpr |  |
 | variables.rs:354:15:354:15 | x | variables.rs:354:5:354:16 | CallExpr |  |
-| variables.rs:357:1:383:1 | enter main | variables.rs:358:5:358:25 | ExprStmt |  |
-| variables.rs:357:1:383:1 | exit main (normal) | variables.rs:357:1:383:1 | exit main |  |
-| variables.rs:357:11:383:1 | BlockExpr | variables.rs:357:1:383:1 | exit main (normal) |  |
-| variables.rs:358:5:358:22 | PathExpr | variables.rs:358:5:358:24 | CallExpr |  |
-| variables.rs:358:5:358:24 | CallExpr | variables.rs:359:5:359:23 | ExprStmt |  |
-| variables.rs:358:5:358:25 | ExprStmt | variables.rs:358:5:358:22 | PathExpr |  |
-| variables.rs:359:5:359:20 | PathExpr | variables.rs:359:5:359:22 | CallExpr |  |
-| variables.rs:359:5:359:22 | CallExpr | variables.rs:360:5:360:23 | ExprStmt |  |
-| variables.rs:359:5:359:23 | ExprStmt | variables.rs:359:5:359:20 | PathExpr |  |
-| variables.rs:360:5:360:20 | PathExpr | variables.rs:360:5:360:22 | CallExpr |  |
-| variables.rs:360:5:360:22 | CallExpr | variables.rs:361:5:361:23 | ExprStmt |  |
-| variables.rs:360:5:360:23 | ExprStmt | variables.rs:360:5:360:20 | PathExpr |  |
-| variables.rs:361:5:361:20 | PathExpr | variables.rs:361:5:361:22 | CallExpr |  |
-| variables.rs:361:5:361:22 | CallExpr | variables.rs:362:5:362:19 | ExprStmt |  |
-| variables.rs:361:5:361:23 | ExprStmt | variables.rs:361:5:361:20 | PathExpr |  |
-| variables.rs:362:5:362:16 | PathExpr | variables.rs:362:5:362:18 | CallExpr |  |
-| variables.rs:362:5:362:18 | CallExpr | variables.rs:363:5:363:19 | ExprStmt |  |
-| variables.rs:362:5:362:19 | ExprStmt | variables.rs:362:5:362:16 | PathExpr |  |
-| variables.rs:363:5:363:16 | PathExpr | variables.rs:363:5:363:18 | CallExpr |  |
-| variables.rs:363:5:363:18 | CallExpr | variables.rs:364:5:364:19 | ExprStmt |  |
-| variables.rs:363:5:363:19 | ExprStmt | variables.rs:363:5:363:16 | PathExpr |  |
-| variables.rs:364:5:364:16 | PathExpr | variables.rs:364:5:364:18 | CallExpr |  |
-| variables.rs:364:5:364:18 | CallExpr | variables.rs:365:5:365:19 | ExprStmt |  |
-| variables.rs:364:5:364:19 | ExprStmt | variables.rs:364:5:364:16 | PathExpr |  |
-| variables.rs:365:5:365:16 | PathExpr | variables.rs:365:5:365:18 | CallExpr |  |
-| variables.rs:365:5:365:18 | CallExpr | variables.rs:366:5:366:21 | ExprStmt |  |
-| variables.rs:365:5:365:19 | ExprStmt | variables.rs:365:5:365:16 | PathExpr |  |
-| variables.rs:366:5:366:18 | PathExpr | variables.rs:366:5:366:20 | CallExpr |  |
-| variables.rs:366:5:366:20 | CallExpr | variables.rs:367:5:367:21 | ExprStmt |  |
-| variables.rs:366:5:366:21 | ExprStmt | variables.rs:366:5:366:18 | PathExpr |  |
-| variables.rs:367:5:367:18 | PathExpr | variables.rs:367:5:367:20 | CallExpr |  |
-| variables.rs:367:5:367:20 | CallExpr | variables.rs:368:5:368:21 | ExprStmt |  |
-| variables.rs:367:5:367:21 | ExprStmt | variables.rs:367:5:367:18 | PathExpr |  |
-| variables.rs:368:5:368:18 | PathExpr | variables.rs:368:5:368:20 | CallExpr |  |
-| variables.rs:368:5:368:20 | CallExpr | variables.rs:369:5:369:21 | ExprStmt |  |
-| variables.rs:368:5:368:21 | ExprStmt | variables.rs:368:5:368:18 | PathExpr |  |
-| variables.rs:369:5:369:18 | PathExpr | variables.rs:369:5:369:20 | CallExpr |  |
-| variables.rs:369:5:369:20 | CallExpr | variables.rs:370:5:370:21 | ExprStmt |  |
-| variables.rs:369:5:369:21 | ExprStmt | variables.rs:369:5:369:18 | PathExpr |  |
-| variables.rs:370:5:370:18 | PathExpr | variables.rs:370:5:370:20 | CallExpr |  |
-| variables.rs:370:5:370:20 | CallExpr | variables.rs:371:5:371:21 | ExprStmt |  |
-| variables.rs:370:5:370:21 | ExprStmt | variables.rs:370:5:370:18 | PathExpr |  |
-| variables.rs:371:5:371:18 | PathExpr | variables.rs:371:5:371:20 | CallExpr |  |
-| variables.rs:371:5:371:20 | CallExpr | variables.rs:372:5:372:21 | ExprStmt |  |
-| variables.rs:371:5:371:21 | ExprStmt | variables.rs:371:5:371:18 | PathExpr |  |
-| variables.rs:372:5:372:18 | PathExpr | variables.rs:372:5:372:20 | CallExpr |  |
-| variables.rs:372:5:372:20 | CallExpr | variables.rs:373:5:373:21 | ExprStmt |  |
-| variables.rs:372:5:372:21 | ExprStmt | variables.rs:372:5:372:18 | PathExpr |  |
-| variables.rs:373:5:373:18 | PathExpr | variables.rs:373:5:373:20 | CallExpr |  |
-| variables.rs:373:5:373:20 | CallExpr | variables.rs:374:5:374:21 | ExprStmt |  |
-| variables.rs:373:5:373:21 | ExprStmt | variables.rs:373:5:373:18 | PathExpr |  |
-| variables.rs:374:5:374:18 | PathExpr | variables.rs:374:5:374:20 | CallExpr |  |
-| variables.rs:374:5:374:20 | CallExpr | variables.rs:375:5:375:36 | ExprStmt |  |
-| variables.rs:374:5:374:21 | ExprStmt | variables.rs:374:5:374:18 | PathExpr |  |
-| variables.rs:375:5:375:18 | PathExpr | variables.rs:375:20:375:22 | "a" |  |
-| variables.rs:375:5:375:35 | CallExpr | variables.rs:376:5:376:37 | ExprStmt |  |
-| variables.rs:375:5:375:36 | ExprStmt | variables.rs:375:5:375:18 | PathExpr |  |
-| variables.rs:375:20:375:22 | "a" | variables.rs:375:26:375:28 | "b" |  |
-| variables.rs:375:25:375:34 | TupleExpr | variables.rs:375:5:375:35 | CallExpr |  |
-| variables.rs:375:26:375:28 | "b" | variables.rs:375:31:375:33 | "c" |  |
-| variables.rs:375:31:375:33 | "c" | variables.rs:375:25:375:34 | TupleExpr |  |
-| variables.rs:376:5:376:18 | PathExpr | variables.rs:376:20:376:31 | PathExpr |  |
-| variables.rs:376:5:376:36 | CallExpr | variables.rs:377:5:377:26 | ExprStmt |  |
-| variables.rs:376:5:376:37 | ExprStmt | variables.rs:376:5:376:18 | PathExpr |  |
-| variables.rs:376:20:376:31 | PathExpr | variables.rs:376:33:376:34 | 45 |  |
-| variables.rs:376:20:376:35 | CallExpr | variables.rs:376:5:376:36 | CallExpr |  |
-| variables.rs:376:33:376:34 | 45 | variables.rs:376:20:376:35 | CallExpr |  |
-| variables.rs:377:5:377:23 | PathExpr | variables.rs:377:5:377:25 | CallExpr |  |
-| variables.rs:377:5:377:25 | CallExpr | variables.rs:378:5:378:23 | ExprStmt |  |
-| variables.rs:377:5:377:26 | ExprStmt | variables.rs:377:5:377:23 | PathExpr |  |
+| variables.rs:357:1:363:1 | enter alias | variables.rs:358:5:358:18 | LetStmt |  |
+| variables.rs:357:1:363:1 | exit alias (normal) | variables.rs:357:1:363:1 | exit alias |  |
+| variables.rs:357:12:363:1 | BlockExpr | variables.rs:357:1:363:1 | exit alias (normal) |  |
+| variables.rs:358:5:358:18 | LetStmt | variables.rs:358:17:358:17 | 1 |  |
+| variables.rs:358:9:358:13 | x | variables.rs:359:5:360:15 | LetStmt | match, no-match |
+| variables.rs:358:17:358:17 | 1 | variables.rs:358:9:358:13 | x |  |
+| variables.rs:359:5:360:15 | LetStmt | variables.rs:360:14:360:14 | x |  |
+| variables.rs:359:9:359:9 | y | variables.rs:361:5:361:11 | ExprStmt | match, no-match |
+| variables.rs:360:9:360:14 | RefExpr | variables.rs:359:9:359:9 | y |  |
+| variables.rs:360:14:360:14 | x | variables.rs:360:9:360:14 | RefExpr |  |
+| variables.rs:361:5:361:6 | * ... | variables.rs:361:10:361:10 | 2 |  |
+| variables.rs:361:5:361:10 | ... = ... | variables.rs:362:5:362:17 | ExprStmt |  |
+| variables.rs:361:5:361:11 | ExprStmt | variables.rs:361:6:361:6 | y |  |
+| variables.rs:361:6:361:6 | y | variables.rs:361:5:361:6 | * ... |  |
+| variables.rs:361:10:361:10 | 2 | variables.rs:361:5:361:10 | ... = ... |  |
+| variables.rs:362:5:362:13 | PathExpr | variables.rs:362:15:362:15 | x |  |
+| variables.rs:362:5:362:16 | CallExpr | variables.rs:357:12:363:1 | BlockExpr |  |
+| variables.rs:362:5:362:17 | ExprStmt | variables.rs:362:5:362:13 | PathExpr |  |
+| variables.rs:362:15:362:15 | x | variables.rs:362:5:362:16 | CallExpr |  |
+| variables.rs:365:1:373:1 | enter capture | variables.rs:366:5:366:19 | LetStmt |  |
+| variables.rs:365:1:373:1 | exit capture (normal) | variables.rs:365:1:373:1 | exit capture |  |
+| variables.rs:365:14:373:1 | BlockExpr | variables.rs:365:1:373:1 | exit capture (normal) |  |
+| variables.rs:366:5:366:19 | LetStmt | variables.rs:366:17:366:18 | 10 |  |
+| variables.rs:366:9:366:13 | x | variables.rs:367:5:370:6 | LetStmt | match, no-match |
+| variables.rs:366:17:366:18 | 10 | variables.rs:366:9:366:13 | x |  |
+| variables.rs:367:5:370:6 | LetStmt | variables.rs:367:19:370:5 | ClosureExpr |  |
+| variables.rs:367:9:367:15 | cap | variables.rs:371:5:371:10 | ExprStmt | match, no-match |
+| variables.rs:367:19:370:5 | ClosureExpr | variables.rs:367:9:367:15 | cap |  |
+| variables.rs:367:19:370:5 | enter ClosureExpr | variables.rs:368:9:368:21 | ExprStmt |  |
+| variables.rs:367:19:370:5 | exit ClosureExpr (normal) | variables.rs:367:19:370:5 | exit ClosureExpr |  |
+| variables.rs:367:22:370:5 | BlockExpr | variables.rs:367:19:370:5 | exit ClosureExpr (normal) |  |
+| variables.rs:368:9:368:17 | PathExpr | variables.rs:368:19:368:19 | x |  |
+| variables.rs:368:9:368:20 | CallExpr | variables.rs:369:9:369:15 | ExprStmt |  |
+| variables.rs:368:9:368:21 | ExprStmt | variables.rs:368:9:368:17 | PathExpr |  |
+| variables.rs:368:19:368:19 | x | variables.rs:368:9:368:20 | CallExpr |  |
+| variables.rs:369:9:369:9 | x | variables.rs:369:14:369:14 | 1 |  |
+| variables.rs:369:9:369:14 | ... += ... | variables.rs:367:22:370:5 | BlockExpr |  |
+| variables.rs:369:9:369:15 | ExprStmt | variables.rs:369:9:369:9 | x |  |
+| variables.rs:369:14:369:14 | 1 | variables.rs:369:9:369:14 | ... += ... |  |
+| variables.rs:371:5:371:7 | cap | variables.rs:371:5:371:9 | CallExpr |  |
+| variables.rs:371:5:371:9 | CallExpr | variables.rs:372:5:372:17 | ExprStmt |  |
+| variables.rs:371:5:371:10 | ExprStmt | variables.rs:371:5:371:7 | cap |  |
+| variables.rs:372:5:372:13 | PathExpr | variables.rs:372:15:372:15 | x |  |
+| variables.rs:372:5:372:16 | CallExpr | variables.rs:365:14:373:1 | BlockExpr |  |
+| variables.rs:372:5:372:17 | ExprStmt | variables.rs:372:5:372:13 | PathExpr |  |
+| variables.rs:372:15:372:15 | x | variables.rs:372:5:372:16 | CallExpr |  |
+| variables.rs:375:1:403:1 | enter main | variables.rs:376:5:376:25 | ExprStmt |  |
+| variables.rs:375:1:403:1 | exit main (normal) | variables.rs:375:1:403:1 | exit main |  |
+| variables.rs:375:11:403:1 | BlockExpr | variables.rs:375:1:403:1 | exit main (normal) |  |
+| variables.rs:376:5:376:22 | PathExpr | variables.rs:376:5:376:24 | CallExpr |  |
+| variables.rs:376:5:376:24 | CallExpr | variables.rs:377:5:377:23 | ExprStmt |  |
+| variables.rs:376:5:376:25 | ExprStmt | variables.rs:376:5:376:22 | PathExpr |  |
+| variables.rs:377:5:377:20 | PathExpr | variables.rs:377:5:377:22 | CallExpr |  |
+| variables.rs:377:5:377:22 | CallExpr | variables.rs:378:5:378:23 | ExprStmt |  |
+| variables.rs:377:5:377:23 | ExprStmt | variables.rs:377:5:377:20 | PathExpr |  |
 | variables.rs:378:5:378:20 | PathExpr | variables.rs:378:5:378:22 | CallExpr |  |
-| variables.rs:378:5:378:22 | CallExpr | variables.rs:379:5:379:19 | ExprStmt |  |
+| variables.rs:378:5:378:22 | CallExpr | variables.rs:379:5:379:23 | ExprStmt |  |
 | variables.rs:378:5:378:23 | ExprStmt | variables.rs:378:5:378:20 | PathExpr |  |
-| variables.rs:379:5:379:16 | PathExpr | variables.rs:379:5:379:18 | CallExpr |  |
-| variables.rs:379:5:379:18 | CallExpr | variables.rs:380:5:380:17 | ExprStmt |  |
-| variables.rs:379:5:379:19 | ExprStmt | variables.rs:379:5:379:16 | PathExpr |  |
-| variables.rs:380:5:380:14 | PathExpr | variables.rs:380:5:380:16 | CallExpr |  |
-| variables.rs:380:5:380:16 | CallExpr | variables.rs:381:5:381:13 | ExprStmt |  |
-| variables.rs:380:5:380:17 | ExprStmt | variables.rs:380:5:380:14 | PathExpr |  |
-| variables.rs:381:5:381:10 | PathExpr | variables.rs:381:5:381:12 | CallExpr |  |
-| variables.rs:381:5:381:12 | CallExpr | variables.rs:382:5:382:17 | ExprStmt |  |
-| variables.rs:381:5:381:13 | ExprStmt | variables.rs:381:5:381:10 | PathExpr |  |
-| variables.rs:382:5:382:14 | PathExpr | variables.rs:382:5:382:16 | CallExpr |  |
-| variables.rs:382:5:382:16 | CallExpr | variables.rs:357:11:383:1 | BlockExpr |  |
-| variables.rs:382:5:382:17 | ExprStmt | variables.rs:382:5:382:14 | PathExpr |  |
+| variables.rs:379:5:379:20 | PathExpr | variables.rs:379:5:379:22 | CallExpr |  |
+| variables.rs:379:5:379:22 | CallExpr | variables.rs:380:5:380:19 | ExprStmt |  |
+| variables.rs:379:5:379:23 | ExprStmt | variables.rs:379:5:379:20 | PathExpr |  |
+| variables.rs:380:5:380:16 | PathExpr | variables.rs:380:5:380:18 | CallExpr |  |
+| variables.rs:380:5:380:18 | CallExpr | variables.rs:381:5:381:19 | ExprStmt |  |
+| variables.rs:380:5:380:19 | ExprStmt | variables.rs:380:5:380:16 | PathExpr |  |
+| variables.rs:381:5:381:16 | PathExpr | variables.rs:381:5:381:18 | CallExpr |  |
+| variables.rs:381:5:381:18 | CallExpr | variables.rs:382:5:382:19 | ExprStmt |  |
+| variables.rs:381:5:381:19 | ExprStmt | variables.rs:381:5:381:16 | PathExpr |  |
+| variables.rs:382:5:382:16 | PathExpr | variables.rs:382:5:382:18 | CallExpr |  |
+| variables.rs:382:5:382:18 | CallExpr | variables.rs:383:5:383:19 | ExprStmt |  |
+| variables.rs:382:5:382:19 | ExprStmt | variables.rs:382:5:382:16 | PathExpr |  |
+| variables.rs:383:5:383:16 | PathExpr | variables.rs:383:5:383:18 | CallExpr |  |
+| variables.rs:383:5:383:18 | CallExpr | variables.rs:384:5:384:21 | ExprStmt |  |
+| variables.rs:383:5:383:19 | ExprStmt | variables.rs:383:5:383:16 | PathExpr |  |
+| variables.rs:384:5:384:18 | PathExpr | variables.rs:384:5:384:20 | CallExpr |  |
+| variables.rs:384:5:384:20 | CallExpr | variables.rs:385:5:385:21 | ExprStmt |  |
+| variables.rs:384:5:384:21 | ExprStmt | variables.rs:384:5:384:18 | PathExpr |  |
+| variables.rs:385:5:385:18 | PathExpr | variables.rs:385:5:385:20 | CallExpr |  |
+| variables.rs:385:5:385:20 | CallExpr | variables.rs:386:5:386:21 | ExprStmt |  |
+| variables.rs:385:5:385:21 | ExprStmt | variables.rs:385:5:385:18 | PathExpr |  |
+| variables.rs:386:5:386:18 | PathExpr | variables.rs:386:5:386:20 | CallExpr |  |
+| variables.rs:386:5:386:20 | CallExpr | variables.rs:387:5:387:21 | ExprStmt |  |
+| variables.rs:386:5:386:21 | ExprStmt | variables.rs:386:5:386:18 | PathExpr |  |
+| variables.rs:387:5:387:18 | PathExpr | variables.rs:387:5:387:20 | CallExpr |  |
+| variables.rs:387:5:387:20 | CallExpr | variables.rs:388:5:388:21 | ExprStmt |  |
+| variables.rs:387:5:387:21 | ExprStmt | variables.rs:387:5:387:18 | PathExpr |  |
+| variables.rs:388:5:388:18 | PathExpr | variables.rs:388:5:388:20 | CallExpr |  |
+| variables.rs:388:5:388:20 | CallExpr | variables.rs:389:5:389:21 | ExprStmt |  |
+| variables.rs:388:5:388:21 | ExprStmt | variables.rs:388:5:388:18 | PathExpr |  |
+| variables.rs:389:5:389:18 | PathExpr | variables.rs:389:5:389:20 | CallExpr |  |
+| variables.rs:389:5:389:20 | CallExpr | variables.rs:390:5:390:21 | ExprStmt |  |
+| variables.rs:389:5:389:21 | ExprStmt | variables.rs:389:5:389:18 | PathExpr |  |
+| variables.rs:390:5:390:18 | PathExpr | variables.rs:390:5:390:20 | CallExpr |  |
+| variables.rs:390:5:390:20 | CallExpr | variables.rs:391:5:391:21 | ExprStmt |  |
+| variables.rs:390:5:390:21 | ExprStmt | variables.rs:390:5:390:18 | PathExpr |  |
+| variables.rs:391:5:391:18 | PathExpr | variables.rs:391:5:391:20 | CallExpr |  |
+| variables.rs:391:5:391:20 | CallExpr | variables.rs:392:5:392:21 | ExprStmt |  |
+| variables.rs:391:5:391:21 | ExprStmt | variables.rs:391:5:391:18 | PathExpr |  |
+| variables.rs:392:5:392:18 | PathExpr | variables.rs:392:5:392:20 | CallExpr |  |
+| variables.rs:392:5:392:20 | CallExpr | variables.rs:393:5:393:36 | ExprStmt |  |
+| variables.rs:392:5:392:21 | ExprStmt | variables.rs:392:5:392:18 | PathExpr |  |
+| variables.rs:393:5:393:18 | PathExpr | variables.rs:393:20:393:22 | "a" |  |
+| variables.rs:393:5:393:35 | CallExpr | variables.rs:394:5:394:37 | ExprStmt |  |
+| variables.rs:393:5:393:36 | ExprStmt | variables.rs:393:5:393:18 | PathExpr |  |
+| variables.rs:393:20:393:22 | "a" | variables.rs:393:26:393:28 | "b" |  |
+| variables.rs:393:25:393:34 | TupleExpr | variables.rs:393:5:393:35 | CallExpr |  |
+| variables.rs:393:26:393:28 | "b" | variables.rs:393:31:393:33 | "c" |  |
+| variables.rs:393:31:393:33 | "c" | variables.rs:393:25:393:34 | TupleExpr |  |
+| variables.rs:394:5:394:18 | PathExpr | variables.rs:394:20:394:31 | PathExpr |  |
+| variables.rs:394:5:394:36 | CallExpr | variables.rs:395:5:395:26 | ExprStmt |  |
+| variables.rs:394:5:394:37 | ExprStmt | variables.rs:394:5:394:18 | PathExpr |  |
+| variables.rs:394:20:394:31 | PathExpr | variables.rs:394:33:394:34 | 45 |  |
+| variables.rs:394:20:394:35 | CallExpr | variables.rs:394:5:394:36 | CallExpr |  |
+| variables.rs:394:33:394:34 | 45 | variables.rs:394:20:394:35 | CallExpr |  |
+| variables.rs:395:5:395:23 | PathExpr | variables.rs:395:5:395:25 | CallExpr |  |
+| variables.rs:395:5:395:25 | CallExpr | variables.rs:396:5:396:23 | ExprStmt |  |
+| variables.rs:395:5:395:26 | ExprStmt | variables.rs:395:5:395:23 | PathExpr |  |
+| variables.rs:396:5:396:20 | PathExpr | variables.rs:396:5:396:22 | CallExpr |  |
+| variables.rs:396:5:396:22 | CallExpr | variables.rs:397:5:397:19 | ExprStmt |  |
+| variables.rs:396:5:396:23 | ExprStmt | variables.rs:396:5:396:20 | PathExpr |  |
+| variables.rs:397:5:397:16 | PathExpr | variables.rs:397:5:397:18 | CallExpr |  |
+| variables.rs:397:5:397:18 | CallExpr | variables.rs:398:5:398:17 | ExprStmt |  |
+| variables.rs:397:5:397:19 | ExprStmt | variables.rs:397:5:397:16 | PathExpr |  |
+| variables.rs:398:5:398:14 | PathExpr | variables.rs:398:5:398:16 | CallExpr |  |
+| variables.rs:398:5:398:16 | CallExpr | variables.rs:399:5:399:13 | ExprStmt |  |
+| variables.rs:398:5:398:17 | ExprStmt | variables.rs:398:5:398:14 | PathExpr |  |
+| variables.rs:399:5:399:10 | PathExpr | variables.rs:399:5:399:12 | CallExpr |  |
+| variables.rs:399:5:399:12 | CallExpr | variables.rs:400:5:400:17 | ExprStmt |  |
+| variables.rs:399:5:399:13 | ExprStmt | variables.rs:399:5:399:10 | PathExpr |  |
+| variables.rs:400:5:400:14 | PathExpr | variables.rs:400:5:400:16 | CallExpr |  |
+| variables.rs:400:5:400:16 | CallExpr | variables.rs:401:5:401:12 | ExprStmt |  |
+| variables.rs:400:5:400:17 | ExprStmt | variables.rs:400:5:400:14 | PathExpr |  |
+| variables.rs:401:5:401:9 | PathExpr | variables.rs:401:5:401:11 | CallExpr |  |
+| variables.rs:401:5:401:11 | CallExpr | variables.rs:402:5:402:14 | ExprStmt |  |
+| variables.rs:401:5:401:12 | ExprStmt | variables.rs:401:5:401:9 | PathExpr |  |
+| variables.rs:402:5:402:11 | PathExpr | variables.rs:402:5:402:13 | CallExpr |  |
+| variables.rs:402:5:402:13 | CallExpr | variables.rs:375:11:403:1 | BlockExpr |  |
+| variables.rs:402:5:402:14 | ExprStmt | variables.rs:402:5:402:11 | PathExpr |  |
 breakTarget
 continueTarget
diff --git a/rust/ql/test/library-tests/variables/variables.expected b/rust/ql/test/library-tests/variables/variables.expected
index ccc1cd6072be..d5256eeea899 100644
--- a/rust/ql/test/library-tests/variables/variables.expected
+++ b/rust/ql/test/library-tests/variables/variables.expected
@@ -24,7 +24,6 @@ variable
 | variables.rs:100:9:100:10 | x6 |
 | variables.rs:101:9:101:10 | y1 |
 | variables.rs:105:14:105:15 | y1 |
-| variables.rs:110:9:110:12 | None |
 | variables.rs:117:9:117:15 | numbers |
 | variables.rs:121:13:121:17 | first |
 | variables.rs:122:13:122:17 | third |
@@ -72,6 +71,10 @@ variable
 | variables.rs:339:9:339:13 | ref_i |
 | variables.rs:345:17:345:17 | x |
 | variables.rs:352:13:352:13 | x |
+| variables.rs:358:13:358:13 | x |
+| variables.rs:359:9:359:9 | y |
+| variables.rs:366:13:366:13 | x |
+| variables.rs:367:13:367:15 | cap |
 variableAccess
 | variables.rs:13:15:13:16 | x1 | variables.rs:12:9:12:10 | x1 |
 | variables.rs:18:15:18:16 | x2 | variables.rs:17:13:17:14 | x2 |
@@ -167,6 +170,13 @@ variableAccess
 | variables.rs:348:10:348:10 | x | variables.rs:345:17:345:17 | x |
 | variables.rs:353:23:353:23 | x | variables.rs:352:13:352:13 | x |
 | variables.rs:354:15:354:15 | x | variables.rs:352:13:352:13 | x |
+| variables.rs:360:14:360:14 | x | variables.rs:358:13:358:13 | x |
+| variables.rs:361:6:361:6 | y | variables.rs:359:9:359:9 | y |
+| variables.rs:362:15:362:15 | x | variables.rs:358:13:358:13 | x |
+| variables.rs:368:19:368:19 | x | variables.rs:366:13:366:13 | x |
+| variables.rs:369:9:369:9 | x | variables.rs:366:13:366:13 | x |
+| variables.rs:371:5:371:7 | cap | variables.rs:367:13:367:15 | cap |
+| variables.rs:372:15:372:15 | x | variables.rs:366:13:366:13 | x |
 variableWriteAccess
 | variables.rs:19:5:19:6 | x2 | variables.rs:17:13:17:14 | x2 |
 | variables.rs:277:9:277:10 | c2 | variables.rs:270:13:270:14 | c2 |
@@ -259,6 +269,11 @@ variableReadAccess
 | variables.rs:347:10:347:10 | x | variables.rs:345:17:345:17 | x |
 | variables.rs:348:10:348:10 | x | variables.rs:345:17:345:17 | x |
 | variables.rs:354:15:354:15 | x | variables.rs:352:13:352:13 | x |
+| variables.rs:361:6:361:6 | y | variables.rs:359:9:359:9 | y |
+| variables.rs:362:15:362:15 | x | variables.rs:358:13:358:13 | x |
+| variables.rs:368:19:368:19 | x | variables.rs:366:13:366:13 | x |
+| variables.rs:371:5:371:7 | cap | variables.rs:367:13:367:15 | cap |
+| variables.rs:372:15:372:15 | x | variables.rs:366:13:366:13 | x |
 variableInitializer
 | variables.rs:12:9:12:10 | x1 | variables.rs:12:14:12:16 | "a" |
 | variables.rs:17:13:17:14 | x2 | variables.rs:17:18:17:18 | 4 |
@@ -288,3 +303,12 @@ variableInitializer
 | variables.rs:338:13:338:13 | i | variables.rs:338:17:338:17 | 1 |
 | variables.rs:339:9:339:13 | ref_i | variables.rs:340:9:340:14 | RefExpr |
 | variables.rs:352:13:352:13 | x | variables.rs:352:17:352:17 | 2 |
+| variables.rs:358:13:358:13 | x | variables.rs:358:17:358:17 | 1 |
+| variables.rs:359:9:359:9 | y | variables.rs:360:9:360:14 | RefExpr |
+| variables.rs:366:13:366:13 | x | variables.rs:366:17:366:18 | 10 |
+| variables.rs:367:13:367:15 | cap | variables.rs:367:19:370:5 | ClosureExpr |
+capturedVariable
+| variables.rs:366:13:366:13 | x |
+capturedAccess
+| variables.rs:368:19:368:19 | x |
+| variables.rs:369:9:369:9 | x |
diff --git a/rust/ql/test/library-tests/variables/variables.ql b/rust/ql/test/library-tests/variables/variables.ql
index 9657c361fd59..23eab9774457 100644
--- a/rust/ql/test/library-tests/variables/variables.ql
+++ b/rust/ql/test/library-tests/variables/variables.ql
@@ -11,6 +11,10 @@ query predicate variableReadAccess(VariableReadAccess va, Variable v) { v = va.g
 
 query predicate variableInitializer(Variable v, Expr e) { e = v.getInitializer() }
 
+query predicate capturedVariable(Variable v) { v.isCaptured() }
+
+query predicate capturedAccess(VariableAccess va) { va.isCapture() }
+
 module VariableAccessTest implements TestSig {
   string getARelevantTag() { result = ["", "write_", "read_"] + "access" }
 
diff --git a/rust/ql/test/library-tests/variables/variables.rs b/rust/ql/test/library-tests/variables/variables.rs
index 52c5288a6b32..bf3491dff613 100644
--- a/rust/ql/test/library-tests/variables/variables.rs
+++ b/rust/ql/test/library-tests/variables/variables.rs
@@ -354,6 +354,24 @@ fn mutate_arg() {
     print_i64(x); // $ read_access=x
 }
 
+fn alias() {
+    let mut x = 1; // x
+    let y = // y
+        &mut x; // $ access=x
+    *y = 2; // $ read_access=y
+    print_i64(x); // $ read_access=x
+}
+
+fn capture() {
+    let mut x = 10; // x
+    let mut cap = || {
+        print_i64(x); // $ read_access=x
+        x += 1; // $ access=x
+    };
+    cap(); // $ read_access=cap
+    print_i64(x); // $ read_access=x
+}
+
 fn main() {
     immutable_variable();
     mutable_variable();
@@ -380,4 +398,6 @@ fn main() {
     add_assign();
     mutate();
     mutate_arg();
+    alias();
+    capture();
 }
diff --git a/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected b/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected
new file mode 100644
index 000000000000..02c2998f1de2
--- /dev/null
+++ b/rust/ql/test/query-tests/unusedentities/UnreachableCode.expected
@@ -0,0 +1,14 @@
+| unreachable.rs:12:3:12:17 | ExprStmt | This code is never reached. |
+| unreachable.rs:20:3:20:17 | ExprStmt | This code is never reached. |
+| unreachable.rs:32:3:32:17 | ExprStmt | This code is never reached. |
+| unreachable.rs:39:3:39:17 | ExprStmt | This code is never reached. |
+| unreachable.rs:60:2:60:16 | ExprStmt | This code is never reached. |
+| unreachable.rs:101:3:101:17 | ExprStmt | This code is never reached. |
+| unreachable.rs:109:3:109:17 | ExprStmt | This code is never reached. |
+| unreachable.rs:124:2:124:16 | ExprStmt | This code is never reached. |
+| unreachable.rs:134:2:134:16 | ExprStmt | This code is never reached. |
+| unreachable.rs:141:3:141:17 | ExprStmt | This code is never reached. |
+| unreachable.rs:150:4:150:18 | ExprStmt | This code is never reached. |
+| unreachable.rs:156:3:156:17 | ExprStmt | This code is never reached. |
+| unreachable.rs:162:4:162:18 | ExprStmt | This code is never reached. |
+| unreachable.rs:165:2:165:16 | ExprStmt | This code is never reached. |
diff --git a/rust/ql/test/query-tests/unusedentities/UnreachableCode.qlref b/rust/ql/test/query-tests/unusedentities/UnreachableCode.qlref
new file mode 100644
index 000000000000..f65928931a13
--- /dev/null
+++ b/rust/ql/test/query-tests/unusedentities/UnreachableCode.qlref
@@ -0,0 +1 @@
+queries/unusedentities/UnreachableCode.ql
\ No newline at end of file
diff --git a/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected b/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected
index fd4b8d3d2b46..ee59aefde2c5 100644
--- a/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected
+++ b/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected
@@ -5,9 +5,15 @@
 | main.rs:164:9:164:9 | x | Variable is not used. |
 | main.rs:169:9:169:9 | x | Variable is not used. |
 | main.rs:174:9:174:9 | x | Variable is not used. |
-| main.rs:195:17:195:17 | a | Variable is not used. |
-| main.rs:203:20:203:22 | val | Variable is not used. |
-| main.rs:216:14:216:16 | val | Variable is not used. |
-| main.rs:218:9:218:12 | None | Variable is not used. |
-| main.rs:227:9:227:12 | None | Variable is not used. |
-| main.rs:233:24:233:26 | val | Variable is not used. |
+| main.rs:202:17:202:17 | a | Variable is not used. |
+| main.rs:210:20:210:22 | val | Variable is not used. |
+| main.rs:223:14:223:16 | val | Variable is not used. |
+| main.rs:240:22:240:24 | val | Variable is not used. |
+| main.rs:248:24:248:26 | val | Variable is not used. |
+| main.rs:257:13:257:15 | num | Variable is not used. |
+| main.rs:272:12:272:12 | j | Variable is not used. |
+| main.rs:294:25:294:25 | y | Variable is not used. |
+| main.rs:298:28:298:28 | a | Variable is not used. |
+| main.rs:302:9:302:9 | p | Variable is not used. |
+| main.rs:309:13:309:13 | y | Variable is not used. |
+| main.rs:317:21:317:21 | y | Variable is not used. |
diff --git a/rust/ql/test/query-tests/unusedentities/main.rs b/rust/ql/test/query-tests/unusedentities/main.rs
index a34219f8a7ab..788918ffcba1 100644
--- a/rust/ql/test/query-tests/unusedentities/main.rs
+++ b/rust/ql/test/query-tests/unusedentities/main.rs
@@ -114,7 +114,7 @@ fn arrays() {
     for k // SPURIOUS: unused variable [macros not yet supported]
 	in ks
 	{
-        println!("lets use {}", k);
+        println!("lets use {}", k); // [unreachable FALSE POSITIVE]
     }
 }
 
@@ -167,12 +167,12 @@ fn loops() {
     for _ in 1..10 {}
 
     for x // SPURIOUS: unused variable [macros not yet supported]
-    in 1..10 {    
+    in 1..10 {
         println!("x is {}", x);
     }
 
     for x // SPURIOUS: unused variable [macros not yet supported]
-    in 1..10 {   
+    in 1..10 {
         assert!(x != 11);
     }
 }
@@ -189,7 +189,14 @@ enum YesOrNo {
     No,
 }
 
-fn if_lets() {
+use YesOrNo::{Yes, No}; // allows `Yes`, `No` to be accessed without qualifiers.
+
+struct MyPoint {
+    x: i64,
+    y: i64,
+}
+
+fn if_lets_matches() {
     let mut total: i64 = 0;
 
     if let Some(a) = Some(10) { // BAD: unused variable
@@ -215,7 +222,7 @@ fn if_lets() {
     match c {
         Some(val) => { // BAD: unused variable
         }
-        None => { // SPURIOUS: unused variable 'None'
+        None => {
         }
     }
 
@@ -224,32 +231,112 @@ fn if_lets() {
         Some(val) => {
             total += val;
         }
-        None => { // SPURIOUS: unused variable 'None'
+        None => {
         }
     }
 
-    let e = MyOption::Some(80);
+    let e = Option::Some(80);
     match e {
+        Option::Some(val) => { // BAD: unused variable
+        }
+        Option::None => {
+        }
+    }
+
+    let f = MyOption::Some(90);
+    match f {
         MyOption::Some(val) => { // BAD: unused variable
         }
         MyOption::None => {}
     }
 
-    let f = YesOrNo::Yes;
-    match f {
+    let g : Result<i64, i64> = Ok(100);
+    match g {
+        Ok(_) => {
+        }
+        Err(num) => {} // BAD: unused variable
+    }
+
+    let h = YesOrNo::Yes;
+    match h {
         YesOrNo::Yes => {}
         YesOrNo::No => {}
     }
+
+    let i = Yes;
+    match i {
+        Yes => {}
+        No => {}
+    }
+
+    if let j = Yes { // BAD: unused variable
+    }
+
+    if let k = Yes {
+        match k {
+            _ => {}
+        }
+    }
+
+    let l = Yes;
+    if let Yes = l {
+    }
+
+    match 1 {
+        1 => {}
+        _ => {}
+    }
+
+    let p1 = MyPoint { x: 1, y: 2 };
+    match p1 {
+        MyPoint { x: 0, y: 0 } => {
+        }
+        MyPoint { x: 1, y } => { // BAD: unused variable
+        }
+        MyPoint { x: 2, y: _ } => {
+        }
+        MyPoint { x: 3, y: a } => { // BAD: unused variable
+        }
+        MyPoint { x: 4, .. } => {
+        }
+        p => { // BAD: unused variable
+        }
+    }
+}
+
+fn shadowing() -> i32 {
+    let x = 1; // BAD: unused value [NOT DETECTED]
+    let mut y: i32; // BAD: unused variable
+
+    {
+        let x = 2;
+        let mut y: i32;
+
+        {
+            let x = 3; // BAD: unused value [NOT DETECTED]
+            let mut y: i32; // BAD: unused variable
+        }
+
+        y = x;
+        return y;
+    }
 }
 
+// --- main ---
 fn main() {
     locals_1();
     locals_2();
     structs();
     arrays();
     statics();
+	println!("lets use result {}", parameters(1, 2, 3));
     loops();
-    if_lets();
-
-    println!("lets use result {}", parameters(1, 2, 3));
+    if_lets_matches();
+    shadowing();
+
+	unreachable_if();
+	unreachable_panic();
+	unreachable_match();
+	unreachable_loop();
+	unreachable_paren();
 }
diff --git a/rust/ql/test/query-tests/unusedentities/unreachable.rs b/rust/ql/test/query-tests/unusedentities/unreachable.rs
new file mode 100644
index 000000000000..8a8fbcf70bdb
--- /dev/null
+++ b/rust/ql/test/query-tests/unusedentities/unreachable.rs
@@ -0,0 +1,172 @@
+
+//fn cond() -> bool;
+//fn get_a_number() -> i32;
+
+// --- unreachable code --
+
+fn do_something() {
+}
+
+fn unreachable_if() {
+	if false {
+		do_something(); // BAD: unreachable code
+	} else {
+		do_something();
+	}
+
+	if true {
+		do_something();
+	} else {
+		do_something(); // BAD: unreachable code
+	}
+
+	let v = get_a_number();
+	if v == 1 {
+		if v != 1 {
+			do_something(); // BAD: unreachable code [NOT DETECTED]
+		}
+	}
+
+	if cond() {
+		return;
+		do_something(); // BAD: unreachable code
+	}
+
+	if cond() {
+		do_something();
+	} else {
+		return;
+		do_something(); // BAD: unreachable code
+	}
+	do_something();
+
+	if cond() {
+		let x = cond();
+
+		if (x) {
+			do_something();
+			if (!x) {
+				do_something(); // BAD: unreachable code [NOT DETECTED]
+			}
+			do_something();
+		}
+	}
+
+	if cond() {
+		return;
+	} else {
+		return;
+	}
+	do_something(); // BAD: unreachable code
+}
+
+fn unreachable_panic() {
+	if cond() {
+		do_something();
+		panic!("Oh no!!!");
+		do_something(); // BAD: unreachable code [NOT DETECTED]
+	}
+
+	if cond() {
+		do_something();
+		unimplemented!();
+		do_something(); // BAD: unreachable code [NOT DETECTED]
+	}
+
+	if cond() {
+		do_something();
+		todo!();
+		do_something(); // BAD: unreachable code [NOT DETECTED]
+	}
+
+	if cond() {
+		let mut maybe;
+
+		maybe = Some("Thing");
+		_ = maybe.unwrap(); // (safe)
+		do_something();
+
+		maybe = if cond() { Some("Other") } else { None };
+		_ = maybe.unwrap(); // (might panic)
+		do_something();
+
+		maybe = None;
+		_ = maybe.unwrap(); // (always panics)
+		do_something(); // BAD: unreachable code [NOT DETECTED]
+	}
+
+	if cond() {
+		do_something();
+		_ = false && panic!(); // does not panic due to short-circuiting
+		do_something(); // SPURIOUS: unreachable
+		_ = false || panic!();
+		do_something(); // BAD: unreachable code [NOT DETECTED]
+	}
+
+	if cond() {
+		do_something();
+		_ = true || panic!(); // does not panic due to short-circuiting
+		do_something(); // SPURIOUS: unreachable
+		_ = true && panic!();
+		do_something(); // BAD: unreachable code [NOT DETECTED]
+	}
+}
+
+fn unreachable_match() {
+	match get_a_number() {
+		1=>{
+			return;
+		}
+		_=>{
+			do_something();
+		}
+	}
+	do_something(); // [unreachable FALSE POSITIVE]
+
+	match get_a_number() {
+		1=>{
+			return;
+		}
+		_=>{
+			return;
+		}
+	}
+	do_something(); // BAD: unreachable code
+}
+
+fn unreachable_loop() {
+	loop {
+		do_something();
+		break;
+		do_something(); // BAD: unreachable code
+	}
+
+	if cond() {
+		while cond() {
+			do_something();
+		}
+
+		while false {
+			do_something(); // BAD: unreachable code
+		}
+
+		while true {
+			do_something();
+		}
+		do_something(); // BAD: unreachable code
+	}
+
+	loop {
+		if cond() {
+			return;
+			do_something(); // BAD: unreachable code
+		}
+	}
+	do_something(); // BAD: unreachable code
+	do_something();
+	do_something();
+}
+
+fn unreachable_paren() {
+	let _ = (((1)));
+}
diff --git a/shared/mad/codeql/mad/modelgenerator/internal/ModelGeneratorImpl.qll b/shared/mad/codeql/mad/modelgenerator/internal/ModelGeneratorImpl.qll
index 8d4bb4cae5a0..d38b83bcf9c4 100644
--- a/shared/mad/codeql/mad/modelgenerator/internal/ModelGeneratorImpl.qll
+++ b/shared/mad/codeql/mad/modelgenerator/internal/ModelGeneratorImpl.qll
@@ -881,7 +881,13 @@ module MakeModelGenerator<
   string captureMixedFlow(DataFlowSummaryTargetApi api, boolean lift) {
     result = ContentSensitive::captureFlow(api, lift)
     or
-    not exists(ContentSensitive::captureFlow(api, _)) and
+    not exists(DataFlowSummaryTargetApi api0 |
+      (api0 = api or api.lift() = api0) and
+      exists(ContentSensitive::captureFlow(api0, false))
+      or
+      api0.lift() = api.lift() and
+      exists(ContentSensitive::captureFlow(api0, true))
+    ) and
     result = captureFlow(api) and
     lift = true
   }
@@ -895,7 +901,8 @@ module MakeModelGenerator<
     not exists(DataFlowSummaryTargetApi api0, boolean lift |
       exists(captureMixedFlow(api0, lift)) and
       (
-        lift = false and api0 = api
+        lift = false and
+        (api0 = api or api0 = api.lift())
         or
         lift = true and api0.lift() = api.lift()
       )
diff --git a/shared/util/codeql/util/DenseRank.qll b/shared/util/codeql/util/DenseRank.qll
new file mode 100644
index 000000000000..d1ba4ae4b62c
--- /dev/null
+++ b/shared/util/codeql/util/DenseRank.qll
@@ -0,0 +1,131 @@
+/**
+ * Provides modules for computing dense `rank`s. See the `DenseRank` module
+ * below for a more detailed explanation.
+ */
+
+/** Provides the input to `DenseRank`. */
+signature module DenseRankInputSig {
+  /** An element that is ranked. */
+  bindingset[this]
+  class Ranked;
+
+  /** Gets the rank of `r`. */
+  int getRank(Ranked r);
+}
+
+/**
+ * Provides the `denseRank` predicate for computing dense `rank`s. For example,
+ * if we have
+ *
+ * ```ql
+ * query predicate names(string name) {
+ *   name = ["Alice", "Bob", "Charles", "Charlie", "David"]
+ * }
+ *
+ * int rankByFirstLetter(string name) {
+ *   name = rank[result](string n | names(n) | n order by n.charAt(0))
+ * }
+ * ```
+ *
+ * then `rankByFirstLetter` computes the following relation
+ *
+ * ```
+ * Alice    1
+ * Bob      2
+ * Charles  3
+ * Charlie  3
+ * David    5
+ * ```
+ *
+ * Note that `"David"` has rank 5 instead of 4. If we want a dense ranking instead,
+ * we can do
+ *
+ * ```ql
+ * module M implements DenseRankInputSig {
+ *   class Ranked = string;
+ *
+ *   predicate getRank = rankByFirstLetter/1;
+ * }
+ *
+ * predicate denseRank = DenseRank<M>::denseRank/1;
+ * ```
+ */
+module DenseRank<DenseRankInputSig Input> {
+  private import Input
+
+  private int rankRank(Ranked r, int rnk) {
+    rnk = getRank(r) and
+    rnk = rank[result](int rnk0 | rnk0 = getRank(_) | rnk0)
+  }
+
+  /** Gets the dense rank of `r`. */
+  int denseRank(Ranked r) { result = rankRank(r, getRank(r)) }
+}
+
+/** Provides the input to `DenseRank2`. */
+signature module DenseRankInputSig2 {
+  /** A ranking context. */
+  bindingset[this]
+  class C;
+
+  /** An element that is ranked. */
+  bindingset[this]
+  class Ranked;
+
+  /** Gets the rank of `r` in the context provided by `c`. */
+  int getRank(C c, Ranked r);
+}
+
+/** Same as `DenseRank`, but allows for a context consisting of one element. */
+module DenseRank2<DenseRankInputSig2 Input> {
+  private import Input
+
+  private int rankRank(C c, Ranked r, int rnk) {
+    rnk = getRank(c, r) and
+    rnk = rank[result](int rnk0 | rnk0 = getRank(c, _) | rnk0)
+  }
+
+  /** Gets the dense rank of `r` in the context provided by `c`. */
+  int denseRank(C c, Ranked r) {
+    exists(int rnk |
+      result = rankRank(c, r, rnk) and
+      rnk = getRank(c, r)
+    )
+  }
+}
+
+/** Provides the input to `DenseRank3`. */
+signature module DenseRankInputSig3 {
+  /** A ranking context. */
+  bindingset[this]
+  class C1;
+
+  /** A ranking context. */
+  bindingset[this]
+  class C2;
+
+  /** An element that is ranked. */
+  bindingset[this]
+  class Ranked;
+
+  /** Gets the rank of `r` in the context provided by `c1` and `c2`. */
+  int getRank(C1 c1, C2 c2, Ranked r);
+}
+
+/** Same as `DenseRank`, but allows for a context consisting of two elements. */
+module DenseRank3<DenseRankInputSig3 Input> {
+  private import Input
+
+  private int rankRank(C1 c1, C2 c2, Ranked r, int rnk) {
+    rnk = getRank(c1, c2, r) and
+    rnk = rank[result](int rnk0 | rnk0 = getRank(c1, c2, _) | rnk0)
+  }
+
+  /** Gets the dense rank of `r` in the context provided by `c1` and `c2`. */
+  int denseRank(C1 c1, C2 c2, Ranked r) {
+    exists(int rnk |
+      result = rankRank(c1, c2, r, rnk) and
+      rnk = getRank(c1, c2, r)
+    )
+  }
+}