diff --git a/cpp/downgrades/abfce5c170f93e281948f7689ece373464fdaf87/expr_reuse.ql b/cpp/downgrades/abfce5c170f93e281948f7689ece373464fdaf87/expr_reuse.ql
new file mode 100644
index 00000000000..201aa17cafd
--- /dev/null
+++ b/cpp/downgrades/abfce5c170f93e281948f7689ece373464fdaf87/expr_reuse.ql
@@ -0,0 +1,7 @@
+class Expr extends @expr {
+  string toString() { none() }
+}
+
+from Expr reuse, Expr original
+where expr_reuse(reuse, original, _)
+select reuse, original
diff --git a/cpp/downgrades/abfce5c170f93e281948f7689ece373464fdaf87/expr_types.ql b/cpp/downgrades/abfce5c170f93e281948f7689ece373464fdaf87/expr_types.ql
new file mode 100644
index 00000000000..0dc918e8d71
--- /dev/null
+++ b/cpp/downgrades/abfce5c170f93e281948f7689ece373464fdaf87/expr_types.ql
@@ -0,0 +1,22 @@
+class Expr extends @expr {
+  string toString() { none() }
+}
+
+class Type extends @type {
+  string toString() { none() }
+}
+
+predicate existingType(Expr expr, Type type, int value_category) {
+  expr_types(expr, type, value_category)
+}
+
+predicate reuseType(Expr reuse, Type type, int value_category) {
+  exists(Expr original |
+    expr_reuse(reuse, original, value_category) and
+    expr_types(original, type, _)
+  )
+}
+
+from Expr expr, Type type, int value_category
+where existingType(expr, type, value_category) or reuseType(expr, type, value_category)
+select expr, type, value_category
diff --git a/cpp/downgrades/abfce5c170f93e281948f7689ece373464fdaf87/old.dbscheme b/cpp/downgrades/abfce5c170f93e281948f7689ece373464fdaf87/old.dbscheme
new file mode 100644
index 00000000000..abfce5c170f
--- /dev/null
+++ b/cpp/downgrades/abfce5c170f93e281948f7689ece373464fdaf87/old.dbscheme
@@ -0,0 +1,2251 @@
+
+/**
+ * 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,
+  int handle: @variable ref,
+  int promise: @variable 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)
+
+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
+);
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default 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
+);
+
+/*
+  Fixed point types
+  precision(1) = short, precision(2) = default, precision(3) = long
+  is_unsigned(1) = unsigned is_unsigned(2) = signed
+  is_fract_type(1) = declared with _Fract
+  saturating(1) = declared with _Sat
+*/
+/* TODO
+fixedpointtypes(
+    unique int id: @fixedpointtype,
+    int precision: int ref,
+    int is_unsigned: int ref,
+    int is_fract_type: int ref,
+    int saturating: int 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
+);
+
+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
+            ;
+
+/*
+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
+
+/*
+  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
+);
+
+/*
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 3 = size_and_alignment
+  ;
+*/
+
+/**
+ * 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
+;
+
+@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
+            ;
+
+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;
+
+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/abfce5c170f93e281948f7689ece373464fdaf87/semmlecode.cpp.dbscheme b/cpp/downgrades/abfce5c170f93e281948f7689ece373464fdaf87/semmlecode.cpp.dbscheme
new file mode 100644
index 00000000000..aa7ff0ab32c
--- /dev/null
+++ b/cpp/downgrades/abfce5c170f93e281948f7689ece373464fdaf87/semmlecode.cpp.dbscheme
@@ -0,0 +1,2250 @@
+
+/**
+ * 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,
+  int handle: @variable ref,
+  int promise: @variable 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)
+
+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
+);
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default 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
+);
+
+/*
+  Fixed point types
+  precision(1) = short, precision(2) = default, precision(3) = long
+  is_unsigned(1) = unsigned is_unsigned(2) = signed
+  is_fract_type(1) = declared with _Fract
+  saturating(1) = declared with _Sat
+*/
+/* TODO
+fixedpointtypes(
+    unique int id: @fixedpointtype,
+    int precision: int ref,
+    int is_unsigned: int ref,
+    int is_fract_type: int ref,
+    int saturating: int 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
+);
+
+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
+            ;
+
+/*
+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
+
+/*
+  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
+);
+
+/*
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 3 = size_and_alignment
+  ;
+*/
+
+/**
+ * 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
+)
+
+/*
+  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
+;
+
+@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
+            ;
+
+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;
+
+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/abfce5c170f93e281948f7689ece373464fdaf87/upgrade.properties b/cpp/downgrades/abfce5c170f93e281948f7689ece373464fdaf87/upgrade.properties
new file mode 100644
index 00000000000..00edbefddf7
--- /dev/null
+++ b/cpp/downgrades/abfce5c170f93e281948f7689ece373464fdaf87/upgrade.properties
@@ -0,0 +1,4 @@
+description: Add value category to expr_reuse table
+compatibility: full
+expr_reuse.rel: run expr_reuse.qlo
+expr_types.rel: run expr_types.qlo
diff --git a/cpp/ql/lib/semmle/code/cpp/exprs/Expr.qll b/cpp/ql/lib/semmle/code/cpp/exprs/Expr.qll
index 42e441668f2..a41a0b35fc8 100644
--- a/cpp/ql/lib/semmle/code/cpp/exprs/Expr.qll
+++ b/cpp/ql/lib/semmle/code/cpp/exprs/Expr.qll
@@ -1340,5 +1340,13 @@ class ReuseExpr extends Expr, @reuseexpr {
   /**
    * Gets the expression that is being re-used.
    */
-  Expr getReusedExpr() { expr_reuse(underlyingElement(this), unresolveElement(result)) }
+  Expr getReusedExpr() { expr_reuse(underlyingElement(this), unresolveElement(result), _) }
+
+  override Type getType() { result = this.getReusedExpr().getType() }
+
+  override predicate isLValueCategory() { expr_reuse(underlyingElement(this), _, 3) }
+
+  override predicate isXValueCategory() { expr_reuse(underlyingElement(this), _, 2) }
+
+  override predicate isPRValueCategory() { expr_reuse(underlyingElement(this), _, 1) }
 }
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme b/cpp/ql/lib/semmlecode.cpp.dbscheme
index aa7ff0ab32c..abfce5c170f 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme
@@ -1515,7 +1515,8 @@ exprs(
 
 expr_reuse(
     int reuse: @expr ref,
-    int original: @expr ref
+    int original: @expr ref,
+    int value_category: int ref
 )
 
 /*
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
index 8d4a841aaf8..d6f973be1f6 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
@@ -2,7 +2,7 @@
     <typesizes>
         <e>
             <k>@compilation</k>
-            <v>9657</v>
+            <v>9654</v>
         </e>
         <e>
             <k>@externalDataElement</k>
@@ -18,71 +18,71 @@
         </e>
         <e>
             <k>@location_default</k>
-            <v>29786456</v>
+            <v>29787737</v>
         </e>
         <e>
             <k>@location_stmt</k>
-            <v>3820105</v>
-        </e>
-        <e>
-            <k>@location_expr</k>
-            <v>13188716</v>
+            <v>3820076</v>
         </e>
         <e>
             <k>@diagnostic</k>
-            <v>5013</v>
+            <v>5001</v>
+        </e>
+        <e>
+            <k>@location_expr</k>
+            <v>13188614</v>
         </e>
         <e>
             <k>@file</k>
-            <v>123134</v>
+            <v>123139</v>
         </e>
         <e>
             <k>@folder</k>
-            <v>16324</v>
+            <v>16325</v>
         </e>
         <e>
             <k>@macro_expansion</k>
-            <v>32971750</v>
+            <v>32959239</v>
         </e>
         <e>
             <k>@other_macro_reference</k>
-            <v>858211</v>
+            <v>858248</v>
         </e>
         <e>
             <k>@function</k>
-            <v>4646000</v>
+            <v>4646200</v>
         </e>
         <e>
             <k>@fun_decl</k>
-            <v>5009807</v>
+            <v>5010023</v>
         </e>
         <e>
             <k>@var_decl</k>
-            <v>8423062</v>
+            <v>8423424</v>
         </e>
         <e>
             <k>@type_decl</k>
-            <v>3242079</v>
+            <v>3242218</v>
         </e>
         <e>
             <k>@namespace_decl</k>
-            <v>311530</v>
+            <v>311523</v>
         </e>
         <e>
             <k>@using</k>
-            <v>369403</v>
+            <v>369419</v>
         </e>
         <e>
             <k>@static_assert</k>
-            <v>134655</v>
+            <v>134652</v>
         </e>
         <e>
             <k>@parameter</k>
-            <v>6576042</v>
+            <v>6576325</v>
         </e>
         <e>
             <k>@membervariable</k>
-            <v>1054758</v>
+            <v>1054750</v>
         </e>
         <e>
             <k>@globalvariable</k>
@@ -90,11 +90,11 @@
         </e>
         <e>
             <k>@localvariable</k>
-            <v>576906</v>
+            <v>576895</v>
         </e>
         <e>
             <k>@enumconstant</k>
-            <v>241684</v>
+            <v>241682</v>
         </e>
         <e>
             <k>@errortype</k>
@@ -322,35 +322,35 @@
         </e>
         <e>
             <k>@pointer</k>
-            <v>567632</v>
+            <v>567656</v>
         </e>
         <e>
             <k>@type_with_specifiers</k>
-            <v>1010263</v>
+            <v>1010307</v>
         </e>
         <e>
             <k>@array</k>
-            <v>110074</v>
+            <v>110079</v>
         </e>
         <e>
             <k>@routineptr</k>
-            <v>624659</v>
+            <v>624503</v>
         </e>
         <e>
             <k>@reference</k>
-            <v>1721148</v>
+            <v>1720495</v>
         </e>
         <e>
             <k>@gnu_vector</k>
-            <v>693</v>
+            <v>671</v>
         </e>
         <e>
             <k>@routinereference</k>
-            <v>235</v>
+            <v>234</v>
         </e>
         <e>
             <k>@rvalue_reference</k>
-            <v>620692</v>
+            <v>620537</v>
         </e>
         <e>
             <k>@block</k>
@@ -358,43 +358,43 @@
         </e>
         <e>
             <k>@decltype</k>
-            <v>27052</v>
+            <v>27053</v>
         </e>
         <e>
             <k>@usertype</k>
-            <v>5229957</v>
+            <v>5230182</v>
         </e>
         <e>
             <k>@mangledname</k>
-            <v>6448244</v>
+            <v>6448521</v>
         </e>
         <e>
             <k>@type_mention</k>
-            <v>4029370</v>
+            <v>4029338</v>
         </e>
         <e>
             <k>@routinetype</k>
-            <v>538161</v>
+            <v>538026</v>
         </e>
         <e>
             <k>@ptrtomember</k>
-            <v>37779</v>
+            <v>37781</v>
         </e>
         <e>
             <k>@specifier</k>
-            <v>24720</v>
+            <v>24721</v>
         </e>
         <e>
             <k>@gnuattribute</k>
-            <v>685636</v>
+            <v>685665</v>
         </e>
         <e>
             <k>@stdattribute</k>
-            <v>487895</v>
+            <v>487639</v>
         </e>
         <e>
             <k>@declspec</k>
-            <v>243123</v>
+            <v>243121</v>
         </e>
         <e>
             <k>@msattribute</k>
@@ -402,15 +402,15 @@
         </e>
         <e>
             <k>@alignas</k>
-            <v>9794</v>
+            <v>9795</v>
         </e>
         <e>
             <k>@attribute_arg_token</k>
-            <v>39179</v>
+            <v>39180</v>
         </e>
         <e>
             <k>@attribute_arg_constant_expr</k>
-            <v>370336</v>
+            <v>370352</v>
         </e>
         <e>
             <k>@attribute_arg_empty</k>
@@ -430,19 +430,19 @@
         </e>
         <e>
             <k>@derivation</k>
-            <v>391086</v>
+            <v>390988</v>
         </e>
         <e>
             <k>@frienddecl</k>
-            <v>706182</v>
+            <v>706005</v>
         </e>
         <e>
             <k>@comment</k>
-            <v>8686670</v>
+            <v>8682106</v>
         </e>
         <e>
             <k>@namespace</k>
-            <v>12126</v>
+            <v>12127</v>
         </e>
         <e>
             <k>@specialnamequalifyingelement</k>
@@ -450,15 +450,15 @@
         </e>
         <e>
             <k>@namequalifier</k>
-            <v>1516804</v>
+            <v>1515301</v>
         </e>
         <e>
             <k>@value</k>
-            <v>10777325</v>
+            <v>10777241</v>
         </e>
         <e>
             <k>@initialiser</k>
-            <v>1710241</v>
+            <v>1710223</v>
         </e>
         <e>
             <k>@address_of</k>
@@ -466,15 +466,15 @@
         </e>
         <e>
             <k>@indirect</k>
-            <v>292663</v>
+            <v>292660</v>
         </e>
         <e>
             <k>@array_to_pointer</k>
-            <v>1430922</v>
+            <v>1430911</v>
         </e>
         <e>
             <k>@parexpr</k>
-            <v>3587688</v>
+            <v>3587661</v>
         </e>
         <e>
             <k>@arithnegexpr</k>
@@ -490,15 +490,15 @@
         </e>
         <e>
             <k>@notexpr</k>
-            <v>276441</v>
+            <v>276439</v>
         </e>
         <e>
             <k>@postincrexpr</k>
-            <v>62049</v>
+            <v>62048</v>
         </e>
         <e>
             <k>@postdecrexpr</k>
-            <v>42038</v>
+            <v>42037</v>
         </e>
         <e>
             <k>@preincrexpr</k>
@@ -510,75 +510,75 @@
         </e>
         <e>
             <k>@conditionalexpr</k>
-            <v>657276</v>
+            <v>657271</v>
         </e>
         <e>
             <k>@addexpr</k>
-            <v>398417</v>
+            <v>398414</v>
         </e>
         <e>
             <k>@subexpr</k>
-            <v>340778</v>
+            <v>340775</v>
         </e>
         <e>
             <k>@mulexpr</k>
-            <v>306374</v>
+            <v>306372</v>
         </e>
         <e>
             <k>@divexpr</k>
-            <v>133174</v>
+            <v>133173</v>
         </e>
         <e>
             <k>@remexpr</k>
-            <v>15622</v>
+            <v>15618</v>
         </e>
         <e>
             <k>@paddexpr</k>
-            <v>86667</v>
+            <v>86666</v>
         </e>
         <e>
             <k>@psubexpr</k>
-            <v>49903</v>
+            <v>49902</v>
         </e>
         <e>
             <k>@pdiffexpr</k>
-            <v>35197</v>
+            <v>35178</v>
         </e>
         <e>
             <k>@lshiftexpr</k>
-            <v>566336</v>
+            <v>566331</v>
         </e>
         <e>
             <k>@rshiftexpr</k>
-            <v>140848</v>
+            <v>140847</v>
         </e>
         <e>
             <k>@andexpr</k>
-            <v>489084</v>
+            <v>489081</v>
         </e>
         <e>
             <k>@orexpr</k>
-            <v>145473</v>
+            <v>145472</v>
         </e>
         <e>
             <k>@xorexpr</k>
-            <v>54178</v>
+            <v>54177</v>
         </e>
         <e>
             <k>@eqexpr</k>
-            <v>470677</v>
+            <v>470674</v>
         </e>
         <e>
             <k>@neexpr</k>
-            <v>301684</v>
+            <v>301682</v>
         </e>
         <e>
             <k>@gtexpr</k>
-            <v>104011</v>
+            <v>104015</v>
         </e>
         <e>
             <k>@ltexpr</k>
-            <v>101679</v>
+            <v>101683</v>
         </e>
         <e>
             <k>@geexpr</k>
@@ -586,11 +586,11 @@
         </e>
         <e>
             <k>@leexpr</k>
-            <v>212539</v>
+            <v>212537</v>
         </e>
         <e>
             <k>@assignexpr</k>
-            <v>937011</v>
+            <v>937004</v>
         </e>
         <e>
             <k>@assignaddexpr</k>
@@ -602,7 +602,7 @@
         </e>
         <e>
             <k>@assignmulexpr</k>
-            <v>8214</v>
+            <v>8210</v>
         </e>
         <e>
             <k>@assigndivexpr</k>
@@ -610,7 +610,7 @@
         </e>
         <e>
             <k>@assignremexpr</k>
-            <v>414</v>
+            <v>413</v>
         </e>
         <e>
             <k>@assignlshiftexpr</k>
@@ -642,23 +642,23 @@
         </e>
         <e>
             <k>@andlogicalexpr</k>
-            <v>249967</v>
+            <v>249965</v>
         </e>
         <e>
             <k>@orlogicalexpr</k>
-            <v>866161</v>
+            <v>866154</v>
         </e>
         <e>
             <k>@commaexpr</k>
-            <v>122776</v>
+            <v>122711</v>
         </e>
         <e>
             <k>@subscriptexpr</k>
-            <v>364887</v>
+            <v>364880</v>
         </e>
         <e>
             <k>@callexpr</k>
-            <v>316232</v>
+            <v>316245</v>
         </e>
         <e>
             <k>@vastartexpr</k>
@@ -678,15 +678,15 @@
         </e>
         <e>
             <k>@varaccess</k>
-            <v>6029477</v>
+            <v>6029430</v>
         </e>
         <e>
             <k>@runtime_sizeof</k>
-            <v>295853</v>
+            <v>295851</v>
         </e>
         <e>
             <k>@runtime_alignof</k>
-            <v>49198</v>
+            <v>49186</v>
         </e>
         <e>
             <k>@expr_stmt</k>
@@ -694,11 +694,11 @@
         </e>
         <e>
             <k>@routineexpr</k>
-            <v>3151079</v>
+            <v>3150048</v>
         </e>
         <e>
             <k>@type_operand</k>
-            <v>1128821</v>
+            <v>1128813</v>
         </e>
         <e>
             <k>@offsetofexpr</k>
@@ -706,7 +706,7 @@
         </e>
         <e>
             <k>@typescompexpr</k>
-            <v>563810</v>
+            <v>563806</v>
         </e>
         <e>
             <k>@literal</k>
@@ -722,27 +722,27 @@
         </e>
         <e>
             <k>@temp_init</k>
-            <v>796653</v>
+            <v>795228</v>
         </e>
         <e>
             <k>@errorexpr</k>
-            <v>46241</v>
+            <v>46229</v>
         </e>
         <e>
             <k>@reference_to</k>
-            <v>1570260</v>
+            <v>1569867</v>
         </e>
         <e>
             <k>@ref_indirect</k>
-            <v>1906893</v>
+            <v>1906417</v>
         </e>
         <e>
             <k>@vacuous_destructor_call</k>
-            <v>8037</v>
+            <v>8035</v>
         </e>
         <e>
             <k>@assume</k>
-            <v>3231</v>
+            <v>3230</v>
         </e>
         <e>
             <k>@conjugation</k>
@@ -794,31 +794,31 @@
         </e>
         <e>
             <k>@thisaccess</k>
-            <v>1117586</v>
+            <v>1117561</v>
         </e>
         <e>
             <k>@new_expr</k>
-            <v>47006</v>
+            <v>46995</v>
         </e>
         <e>
             <k>@delete_expr</k>
-            <v>11621</v>
+            <v>11618</v>
         </e>
         <e>
             <k>@throw_expr</k>
-            <v>21061</v>
+            <v>21053</v>
         </e>
         <e>
             <k>@condition_decl</k>
-            <v>40853</v>
+            <v>40753</v>
         </e>
         <e>
             <k>@braced_init_list</k>
-            <v>1067</v>
+            <v>1064</v>
         </e>
         <e>
             <k>@type_id</k>
-            <v>35977</v>
+            <v>35968</v>
         </e>
         <e>
             <k>@sizeof_pack</k>
@@ -878,11 +878,11 @@
         </e>
         <e>
             <k>@isconvtoexpr</k>
-            <v>207</v>
+            <v>206</v>
         </e>
         <e>
             <k>@isemptyexpr</k>
-            <v>1461</v>
+            <v>1460</v>
         </e>
         <e>
             <k>@isenumexpr</k>
@@ -914,7 +914,7 @@
         </e>
         <e>
             <k>@delete_array_expr</k>
-            <v>1365</v>
+            <v>1364</v>
         </e>
         <e>
             <k>@new_array_expr</k>
@@ -926,55 +926,55 @@
         </e>
         <e>
             <k>@ctordirectinit</k>
-            <v>111410</v>
+            <v>111383</v>
         </e>
         <e>
             <k>@ctorvirtualinit</k>
-            <v>6322</v>
+            <v>6320</v>
         </e>
         <e>
             <k>@ctorfieldinit</k>
-            <v>198326</v>
+            <v>198277</v>
         </e>
         <e>
             <k>@ctordelegatinginit</k>
-            <v>3305</v>
+            <v>3304</v>
         </e>
         <e>
             <k>@dtordirectdestruct</k>
-            <v>41231</v>
+            <v>41220</v>
         </e>
         <e>
             <k>@dtorvirtualdestruct</k>
-            <v>4070</v>
+            <v>4069</v>
         </e>
         <e>
             <k>@dtorfielddestruct</k>
-            <v>41126</v>
+            <v>41116</v>
         </e>
         <e>
             <k>@static_cast</k>
-            <v>214451</v>
+            <v>214369</v>
         </e>
         <e>
             <k>@reinterpret_cast</k>
-            <v>30745</v>
+            <v>30729</v>
         </e>
         <e>
             <k>@const_cast</k>
-            <v>34990</v>
+            <v>34971</v>
         </e>
         <e>
             <k>@dynamic_cast</k>
-            <v>1007</v>
+            <v>1006</v>
         </e>
         <e>
             <k>@lambdaexpr</k>
-            <v>21455</v>
+            <v>21456</v>
         </e>
         <e>
             <k>@param_ref</k>
-            <v>236428</v>
+            <v>235847</v>
         </e>
         <e>
             <k>@noopexpr</k>
@@ -994,7 +994,7 @@
         </e>
         <e>
             <k>@istriviallydestructibleexpr</k>
-            <v>828</v>
+            <v>827</v>
         </e>
         <e>
             <k>@istriviallyassignableexpr</k>
@@ -1002,7 +1002,7 @@
         </e>
         <e>
             <k>@isnothrowassignableexpr</k>
-            <v>4140</v>
+            <v>4138</v>
         </e>
         <e>
             <k>@istrivialexpr</k>
@@ -1038,7 +1038,7 @@
         </e>
         <e>
             <k>@isnothrowconstructibleexpr</k>
-            <v>14285</v>
+            <v>14278</v>
         </e>
         <e>
             <k>@hasfinalizerexpr</k>
@@ -1074,11 +1074,11 @@
         </e>
         <e>
             <k>@isfinalexpr</k>
-            <v>1670</v>
+            <v>1669</v>
         </e>
         <e>
             <k>@noexceptexpr</k>
-            <v>24725</v>
+            <v>24664</v>
         </e>
         <e>
             <k>@builtinshufflevector</k>
@@ -1090,7 +1090,7 @@
         </e>
         <e>
             <k>@builtinaddressof</k>
-            <v>13117</v>
+            <v>13114</v>
         </e>
         <e>
             <k>@vec_fill</k>
@@ -1134,7 +1134,7 @@
         </e>
         <e>
             <k>@builtinshuffle</k>
-            <v>1902</v>
+            <v>1901</v>
         </e>
         <e>
             <k>@blockassignexpr</k>
@@ -1250,67 +1250,67 @@
         </e>
         <e>
             <k>@reuseexpr</k>
-            <v>331632</v>
+            <v>333955</v>
         </e>
         <e>
             <k>@lambdacapture</k>
-            <v>27985</v>
+            <v>27986</v>
         </e>
         <e>
             <k>@stmt_expr</k>
-            <v>1486111</v>
+            <v>1486099</v>
         </e>
         <e>
             <k>@stmt_if</k>
-            <v>725956</v>
+            <v>725951</v>
         </e>
         <e>
             <k>@stmt_while</k>
-            <v>29152</v>
+            <v>29141</v>
         </e>
         <e>
             <k>@stmt_goto</k>
-            <v>110697</v>
+            <v>110696</v>
         </e>
         <e>
             <k>@stmt_label</k>
-            <v>53145</v>
+            <v>53144</v>
         </e>
         <e>
             <k>@stmt_return</k>
-            <v>1284984</v>
+            <v>1285039</v>
         </e>
         <e>
             <k>@stmt_block</k>
-            <v>1423977</v>
+            <v>1424038</v>
         </e>
         <e>
             <k>@stmt_end_test_while</k>
-            <v>148882</v>
+            <v>148881</v>
         </e>
         <e>
             <k>@stmt_for</k>
-            <v>61560</v>
+            <v>61559</v>
         </e>
         <e>
             <k>@stmt_switch_case</k>
-            <v>201865</v>
+            <v>207702</v>
         </e>
         <e>
             <k>@stmt_switch</k>
-            <v>20788</v>
+            <v>20787</v>
         </e>
         <e>
             <k>@stmt_asm</k>
-            <v>109989</v>
+            <v>109988</v>
         </e>
         <e>
             <k>@stmt_decl</k>
-            <v>589211</v>
+            <v>588988</v>
         </e>
         <e>
             <k>@stmt_empty</k>
-            <v>191899</v>
+            <v>191895</v>
         </e>
         <e>
             <k>@stmt_continue</k>
@@ -1318,11 +1318,11 @@
         </e>
         <e>
             <k>@stmt_break</k>
-            <v>103183</v>
+            <v>103193</v>
         </e>
         <e>
             <k>@stmt_try_block</k>
-            <v>45181</v>
+            <v>45069</v>
         </e>
         <e>
             <k>@stmt_microsoft_try</k>
@@ -1346,11 +1346,11 @@
         </e>
         <e>
             <k>@stmt_handler</k>
-            <v>62891</v>
+            <v>62736</v>
         </e>
         <e>
             <k>@stmt_constexpr_if</k>
-            <v>52071</v>
+            <v>52043</v>
         </e>
         <e>
             <k>@stmt_co_return</k>
@@ -1358,39 +1358,39 @@
         </e>
         <e>
             <k>@ppd_if</k>
-            <v>666512</v>
+            <v>666541</v>
         </e>
         <e>
             <k>@ppd_ifdef</k>
-            <v>263060</v>
+            <v>263071</v>
         </e>
         <e>
             <k>@ppd_ifndef</k>
-            <v>266325</v>
+            <v>266336</v>
         </e>
         <e>
             <k>@ppd_elif</k>
-            <v>25186</v>
+            <v>25187</v>
         </e>
         <e>
             <k>@ppd_else</k>
-            <v>208955</v>
+            <v>208964</v>
         </e>
         <e>
             <k>@ppd_endif</k>
-            <v>1195898</v>
+            <v>1195950</v>
         </e>
         <e>
             <k>@ppd_plain_include</k>
-            <v>311101</v>
+            <v>311114</v>
         </e>
         <e>
             <k>@ppd_define</k>
-            <v>2408524</v>
+            <v>2407258</v>
         </e>
         <e>
             <k>@ppd_undef</k>
-            <v>258396</v>
+            <v>258407</v>
         </e>
         <e>
             <k>@ppd_include_next</k>
@@ -1406,7 +1406,7 @@
         </e>
         <e>
             <k>@ppd_pragma</k>
-            <v>311805</v>
+            <v>311642</v>
         </e>
         <e>
             <k>@ppd_objc_import</k>
@@ -1418,7 +1418,7 @@
         </e>
         <e>
             <k>@link_target</k>
-            <v>819</v>
+            <v>817</v>
         </e>
         <e>
             <k>@xmldtd</k>
@@ -1436,23 +1436,23 @@
             <k>@xmlnamespace</k>
             <v>4185</v>
         </e>
-        <e>
-            <k>@xmlcomment</k>
-            <v>26812</v>
-        </e>
         <e>
             <k>@xmlcharacters</k>
             <v>439958</v>
         </e>
+        <e>
+            <k>@xmlcomment</k>
+            <v>26812</v>
+        </e>
     </typesizes>
     <stats>
         <relation>
             <name>compilations</name>
-            <cardinality>9657</cardinality>
+            <cardinality>9654</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9657</v>
+                    <v>9654</v>
                 </e>
                 <e>
                     <k>cwd</k>
@@ -1470,7 +1470,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9657</v>
+                                    <v>9654</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1496,7 +1496,7 @@
         </relation>
         <relation>
             <name>compilation_args</name>
-            <cardinality>652589</cardinality>
+            <cardinality>652584</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -1508,7 +1508,7 @@
                 </e>
                 <e>
                     <k>arg</k>
-                    <v>34463</v>
+                    <v>34462</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2044,7 +2044,7 @@
                 </e>
                 <e>
                     <k>seconds</k>
-                    <v>9828</v>
+                    <v>9748</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2125,47 +2125,47 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>719</v>
+                                    <v>759</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>279</v>
+                                    <v>239</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>8</b>
-                                    <v>159</v>
+                                    <b>7</b>
+                                    <v>119</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
+                                    <a>8</a>
                                     <b>10</b>
                                     <v>159</v>
                                 </b>
                                 <b>
                                     <a>10</a>
+                                    <b>11</b>
+                                    <v>79</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
                                     <b>12</b>
                                     <v>159</v>
                                 </b>
                                 <b>
                                     <a>12</a>
-                                    <b>16</b>
-                                    <v>119</v>
-                                </b>
-                                <b>
-                                    <a>16</a>
-                                    <b>18</b>
+                                    <b>17</b>
                                     <v>159</v>
                                 </b>
                                 <b>
-                                    <a>19</a>
-                                    <b>43</b>
+                                    <a>18</a>
+                                    <b>22</b>
                                     <v>159</v>
                                 </b>
                                 <b>
-                                    <a>57</a>
-                                    <b>92</b>
-                                    <v>79</v>
+                                    <a>25</a>
+                                    <b>98</b>
+                                    <v>159</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2233,22 +2233,22 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1478</v>
+                                    <v>1438</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>279</v>
+                                    <v>319</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>239</v>
+                                    <v>199</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>439</v>
+                                    <v>479</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -2257,18 +2257,18 @@
                                 </b>
                                 <b>
                                     <a>8</a>
-                                    <b>9</b>
-                                    <v>199</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>23</b>
+                                    <b>10</b>
                                     <v>279</v>
                                 </b>
                                 <b>
-                                    <a>24</a>
-                                    <b>90</b>
-                                    <v>279</v>
+                                    <a>10</a>
+                                    <b>26</b>
+                                    <v>239</v>
+                                </b>
+                                <b>
+                                    <a>26</a>
+                                    <b>84</b>
+                                    <v>239</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2316,21 +2316,16 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
+                                    <v>79</v>
+                                </b>
+                                <b>
+                                    <a>137</a>
+                                    <b>138</b>
                                     <v>39</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>39</v>
-                                </b>
-                                <b>
-                                    <a>136</a>
-                                    <b>137</b>
-                                    <v>39</v>
-                                </b>
-                                <b>
-                                    <a>146</a>
-                                    <b>147</b>
+                                    <a>142</a>
+                                    <b>143</b>
                                     <v>39</v>
                                 </b>
                             </bs>
@@ -2347,27 +2342,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4834</v>
+                                    <v>4994</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2557</v>
+                                    <v>2117</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1238</v>
+                                    <v>1278</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>719</v>
+                                    <v>958</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>46</b>
-                                    <v>479</v>
+                                    <b>47</b>
+                                    <v>399</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2383,32 +2378,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4474</v>
+                                    <v>4554</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2197</v>
+                                    <v>1997</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1318</v>
+                                    <v>1238</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>679</v>
+                                    <v>839</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>799</v>
+                                    <v>878</v>
                                 </b>
                                 <b>
                                     <a>7</a>
-                                    <b>76</b>
-                                    <v>359</v>
+                                    <b>74</b>
+                                    <v>239</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2429,7 +2424,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1718</v>
+                                    <v>1638</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2439,15 +2434,15 @@
         </relation>
         <relation>
             <name>diagnostic_for</name>
-            <cardinality>5471</cardinality>
+            <cardinality>5457</cardinality>
             <columnsizes>
                 <e>
                     <k>diagnostic</k>
-                    <v>5013</v>
+                    <v>5001</v>
                 </e>
                 <e>
                     <k>compilation</k>
-                    <v>819</v>
+                    <v>817</v>
                 </e>
                 <e>
                     <k>file_number</k>
@@ -2455,7 +2450,7 @@
                 </e>
                 <e>
                     <k>file_number_diagnostic_number</k>
-                    <v>400</v>
+                    <v>399</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2469,7 +2464,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4861</v>
+                                    <v>4849</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -2490,7 +2485,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5013</v>
+                                    <v>5001</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2506,7 +2501,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5013</v>
+                                    <v>5001</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2522,7 +2517,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>610</v>
+                                    <v>608</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -2558,7 +2553,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>819</v>
+                                    <v>817</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2574,7 +2569,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>610</v>
+                                    <v>608</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -2755,7 +2750,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>400</v>
+                                    <v>399</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2765,15 +2760,15 @@
         </relation>
         <relation>
             <name>compilation_finished</name>
-            <cardinality>9657</cardinality>
+            <cardinality>9654</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9657</v>
+                    <v>9654</v>
                 </e>
                 <e>
                     <k>cpu_seconds</k>
-                    <v>7330</v>
+                    <v>7763</v>
                 </e>
                 <e>
                     <k>elapsed_seconds</k>
@@ -2791,7 +2786,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9657</v>
+                                    <v>9654</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2807,7 +2802,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9657</v>
+                                    <v>9654</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2823,17 +2818,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6054</v>
+                                    <v>6510</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>850</v>
+                                    <v>872</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>20</b>
-                                    <v>425</v>
+                                    <b>14</b>
+                                    <v>380</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2849,12 +2844,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6692</v>
+                                    <v>7461</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>637</v>
+                                    <v>302</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2868,53 +2863,63 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1</a>
-                                    <b>2</b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>22</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>33</v>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>11</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>22</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>12</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>12</a>
-                                    <b>13</b>
+                                    <a>8</a>
+                                    <b>9</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>52</a>
-                                    <b>53</b>
+                                    <a>9</a>
+                                    <b>10</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>161</a>
-                                    <b>162</b>
+                                    <a>37</a>
+                                    <b>38</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>163</a>
-                                    <b>164</b>
+                                    <a>47</a>
+                                    <b>48</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>184</a>
-                                    <b>185</b>
+                                    <a>118</a>
+                                    <b>119</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>259</a>
-                                    <b>260</b>
+                                    <a>140</a>
+                                    <b>141</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>229</a>
+                                    <b>230</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>255</a>
+                                    <b>256</b>
                                     <v>11</v>
                                 </b>
                             </bs>
@@ -2929,53 +2934,63 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1</a>
-                                    <b>2</b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>22</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>33</v>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>11</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>22</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>12</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>12</a>
-                                    <b>13</b>
+                                    <a>8</a>
+                                    <b>9</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>52</a>
-                                    <b>53</b>
+                                    <a>9</a>
+                                    <b>10</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>115</a>
-                                    <b>116</b>
+                                    <a>37</a>
+                                    <b>38</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>119</a>
-                                    <b>120</b>
+                                    <a>47</a>
+                                    <b>48</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>140</a>
-                                    <b>141</b>
+                                    <a>97</a>
+                                    <b>98</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>242</a>
-                                    <b>243</b>
+                                    <a>112</a>
+                                    <b>113</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>183</a>
+                                    <b>184</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>208</a>
+                                    <b>209</b>
                                     <v>11</v>
                                 </b>
                             </bs>
@@ -4748,31 +4763,31 @@
         </relation>
         <relation>
             <name>locations_default</name>
-            <cardinality>29786456</cardinality>
+            <cardinality>29787737</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>29786456</v>
+                    <v>29787737</v>
                 </e>
                 <e>
                     <k>container</k>
-                    <v>123134</v>
+                    <v>123139</v>
                 </e>
                 <e>
                     <k>startLine</k>
-                    <v>2093288</v>
+                    <v>2093378</v>
                 </e>
                 <e>
                     <k>startColumn</k>
-                    <v>36847</v>
+                    <v>36848</v>
                 </e>
                 <e>
                     <k>endLine</k>
-                    <v>2097486</v>
+                    <v>2097576</v>
                 </e>
                 <e>
                     <k>endColumn</k>
-                    <v>48041</v>
+                    <v>48043</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -4786,7 +4801,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29786456</v>
+                                    <v>29787737</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4802,7 +4817,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29786456</v>
+                                    <v>29787737</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4818,7 +4833,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29786456</v>
+                                    <v>29787737</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4834,7 +4849,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29786456</v>
+                                    <v>29787737</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4850,7 +4865,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29786456</v>
+                                    <v>29787737</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4866,7 +4881,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>11</b>
-                                    <v>9794</v>
+                                    <v>9795</v>
                                 </b>
                                 <b>
                                     <a>11</a>
@@ -4881,12 +4896,12 @@
                                 <b>
                                     <a>30</a>
                                     <b>42</b>
-                                    <v>9794</v>
+                                    <v>9795</v>
                                 </b>
                                 <b>
                                     <a>43</a>
                                     <b>61</b>
-                                    <v>9794</v>
+                                    <v>9795</v>
                                 </b>
                                 <b>
                                     <a>61</a>
@@ -4896,7 +4911,7 @@
                                 <b>
                                     <a>80</a>
                                     <b>106</b>
-                                    <v>9794</v>
+                                    <v>9795</v>
                                 </b>
                                 <b>
                                     <a>109</a>
@@ -4952,7 +4967,7 @@
                                 <b>
                                     <a>13</a>
                                     <b>20</b>
-                                    <v>9794</v>
+                                    <v>9795</v>
                                 </b>
                                 <b>
                                     <a>20</a>
@@ -4962,7 +4977,7 @@
                                 <b>
                                     <a>32</a>
                                     <b>43</b>
-                                    <v>9794</v>
+                                    <v>9795</v>
                                 </b>
                                 <b>
                                     <a>44</a>
@@ -5023,7 +5038,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>4</b>
-                                    <v>8861</v>
+                                    <v>8862</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -5033,7 +5048,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>7462</v>
+                                    <v>7463</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -5048,12 +5063,12 @@
                                 <b>
                                     <a>10</a>
                                     <b>15</b>
-                                    <v>10727</v>
+                                    <v>10728</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>23</b>
-                                    <v>9794</v>
+                                    <v>9795</v>
                                 </b>
                                 <b>
                                     <a>23</a>
@@ -5063,7 +5078,7 @@
                                 <b>
                                     <a>28</a>
                                     <b>34</b>
-                                    <v>9794</v>
+                                    <v>9795</v>
                                 </b>
                                 <b>
                                     <a>34</a>
@@ -5078,7 +5093,7 @@
                                 <b>
                                     <a>55</a>
                                     <b>66</b>
-                                    <v>9794</v>
+                                    <v>9795</v>
                                 </b>
                                 <b>
                                     <a>66</a>
@@ -5109,7 +5124,7 @@
                                 <b>
                                     <a>13</a>
                                     <b>20</b>
-                                    <v>9794</v>
+                                    <v>9795</v>
                                 </b>
                                 <b>
                                     <a>20</a>
@@ -5119,7 +5134,7 @@
                                 <b>
                                     <a>32</a>
                                     <b>43</b>
-                                    <v>9794</v>
+                                    <v>9795</v>
                                 </b>
                                 <b>
                                     <a>43</a>
@@ -5180,7 +5195,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>9</b>
-                                    <v>9794</v>
+                                    <v>9795</v>
                                 </b>
                                 <b>
                                     <a>9</a>
@@ -5230,12 +5245,12 @@
                                 <b>
                                     <a>66</a>
                                     <b>74</b>
-                                    <v>9794</v>
+                                    <v>9795</v>
                                 </b>
                                 <b>
                                     <a>74</a>
                                     <b>78</b>
-                                    <v>9794</v>
+                                    <v>9795</v>
                                 </b>
                                 <b>
                                     <a>78</a>
@@ -5256,47 +5271,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>581158</v>
+                                    <v>581183</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>314832</v>
+                                    <v>314846</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>194963</v>
+                                    <v>194971</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>162313</v>
+                                    <v>162320</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>183302</v>
+                                    <v>183310</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>16</b>
-                                    <v>161847</v>
+                                    <v>161854</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>25</b>
-                                    <v>168377</v>
+                                    <v>168384</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>45</b>
-                                    <v>157183</v>
+                                    <v>157189</v>
                                 </b>
                                 <b>
                                     <a>45</a>
                                     <b>160</b>
-                                    <v>157649</v>
+                                    <v>157656</v>
                                 </b>
                                 <b>
                                     <a>160</a>
@@ -5317,42 +5332,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>870338</v>
+                                    <v>870375</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>273321</v>
+                                    <v>273333</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>193563</v>
+                                    <v>193572</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>173507</v>
+                                    <v>173515</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>13</b>
-                                    <v>187966</v>
+                                    <v>187974</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>20</b>
-                                    <v>160914</v>
+                                    <v>160921</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>51</b>
-                                    <v>159515</v>
+                                    <v>159522</v>
                                 </b>
                                 <b>
                                     <a>51</a>
                                     <b>265</b>
-                                    <v>74160</v>
+                                    <v>74163</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5368,47 +5383,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>611475</v>
+                                    <v>611501</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>312967</v>
+                                    <v>312980</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>198228</v>
+                                    <v>198236</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>182836</v>
+                                    <v>182844</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>173041</v>
+                                    <v>173048</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>13</b>
-                                    <v>163246</v>
+                                    <v>163253</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>19</b>
-                                    <v>173974</v>
+                                    <v>173981</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>29</b>
-                                    <v>165112</v>
+                                    <v>165119</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>52</b>
-                                    <v>112407</v>
+                                    <v>112411</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5424,22 +5439,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1530321</v>
+                                    <v>1530386</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>348415</v>
+                                    <v>348430</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>161847</v>
+                                    <v>161854</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>16</b>
-                                    <v>52705</v>
+                                    <v>52707</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5455,47 +5470,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>585822</v>
+                                    <v>585847</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>316232</v>
+                                    <v>316245</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>197761</v>
+                                    <v>197770</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>168377</v>
+                                    <v>168384</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>191698</v>
+                                    <v>191706</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>15</b>
-                                    <v>165578</v>
+                                    <v>165585</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>22</b>
-                                    <v>167910</v>
+                                    <v>167918</v>
                                 </b>
                                 <b>
                                     <a>22</a>
                                     <b>34</b>
-                                    <v>164179</v>
+                                    <v>164186</v>
                                 </b>
                                 <b>
                                     <a>34</a>
                                     <b>66</b>
-                                    <v>135727</v>
+                                    <v>135733</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5597,7 +5612,7 @@
                                 <b>
                                     <a>23</a>
                                     <b>35</b>
-                                    <v>3264</v>
+                                    <v>3265</v>
                                 </b>
                                 <b>
                                     <a>38</a>
@@ -5617,7 +5632,7 @@
                                 <b>
                                     <a>73</a>
                                     <b>84</b>
-                                    <v>3264</v>
+                                    <v>3265</v>
                                 </b>
                                 <b>
                                     <a>84</a>
@@ -5627,12 +5642,12 @@
                                 <b>
                                     <a>96</a>
                                     <b>101</b>
-                                    <v>3264</v>
+                                    <v>3265</v>
                                 </b>
                                 <b>
                                     <a>101</a>
                                     <b>105</b>
-                                    <v>3264</v>
+                                    <v>3265</v>
                                 </b>
                                 <b>
                                     <a>107</a>
@@ -5835,12 +5850,12 @@
                                 <b>
                                     <a>7</a>
                                     <b>11</b>
-                                    <v>3264</v>
+                                    <v>3265</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>16</b>
-                                    <v>3264</v>
+                                    <v>3265</v>
                                 </b>
                                 <b>
                                     <a>16</a>
@@ -5850,7 +5865,7 @@
                                 <b>
                                     <a>22</a>
                                     <b>24</b>
-                                    <v>3264</v>
+                                    <v>3265</v>
                                 </b>
                                 <b>
                                     <a>24</a>
@@ -5860,12 +5875,12 @@
                                 <b>
                                     <a>29</a>
                                     <b>34</b>
-                                    <v>3264</v>
+                                    <v>3265</v>
                                 </b>
                                 <b>
                                     <a>34</a>
                                     <b>41</b>
-                                    <v>3264</v>
+                                    <v>3265</v>
                                 </b>
                                 <b>
                                     <a>41</a>
@@ -5906,47 +5921,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>591419</v>
+                                    <v>591444</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>306903</v>
+                                    <v>306916</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>198228</v>
+                                    <v>198236</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>159515</v>
+                                    <v>159522</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>182836</v>
+                                    <v>182844</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>16</b>
-                                    <v>160448</v>
+                                    <v>160455</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>25</b>
-                                    <v>170709</v>
+                                    <v>170716</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>45</b>
-                                    <v>158116</v>
+                                    <v>158122</v>
                                 </b>
                                 <b>
                                     <a>45</a>
                                     <b>160</b>
-                                    <v>158116</v>
+                                    <v>158122</v>
                                 </b>
                                 <b>
                                     <a>160</a>
@@ -5967,42 +5982,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>885729</v>
+                                    <v>885767</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>259795</v>
+                                    <v>259806</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>125000</v>
+                                    <v>125005</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>140858</v>
+                                    <v>140864</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>184701</v>
+                                    <v>184709</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>15</b>
-                                    <v>168377</v>
+                                    <v>168384</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>26</b>
-                                    <v>163246</v>
+                                    <v>163253</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>120</b>
-                                    <v>158116</v>
+                                    <v>158122</v>
                                 </b>
                                 <b>
                                     <a>121</a>
@@ -6023,22 +6038,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1527988</v>
+                                    <v>1528054</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>341418</v>
+                                    <v>341433</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>170709</v>
+                                    <v>170716</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>10</b>
-                                    <v>57369</v>
+                                    <v>57372</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6054,47 +6069,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>622669</v>
+                                    <v>622696</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>303172</v>
+                                    <v>303185</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>201493</v>
+                                    <v>201501</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>183769</v>
+                                    <v>183777</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>169776</v>
+                                    <v>169783</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>13</b>
-                                    <v>166511</v>
+                                    <v>166518</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>19</b>
-                                    <v>174907</v>
+                                    <v>174914</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>29</b>
-                                    <v>160914</v>
+                                    <v>160921</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>52</b>
-                                    <v>114272</v>
+                                    <v>114277</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6110,47 +6125,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>597949</v>
+                                    <v>597975</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>306903</v>
+                                    <v>306916</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>196362</v>
+                                    <v>196370</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>169310</v>
+                                    <v>169317</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>154851</v>
+                                    <v>154857</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>14</b>
-                                    <v>168377</v>
+                                    <v>168384</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>21</b>
-                                    <v>178638</v>
+                                    <v>178646</v>
                                 </b>
                                 <b>
                                     <a>21</a>
                                     <b>32</b>
-                                    <v>163246</v>
+                                    <v>163253</v>
                                 </b>
                                 <b>
                                     <a>32</a>
                                     <b>60</b>
-                                    <v>158116</v>
+                                    <v>158122</v>
                                 </b>
                                 <b>
                                     <a>60</a>
@@ -6434,17 +6449,17 @@
                                 <b>
                                     <a>35</a>
                                     <b>39</b>
-                                    <v>3264</v>
+                                    <v>3265</v>
                                 </b>
                                 <b>
                                     <a>39</a>
                                     <b>42</b>
-                                    <v>3264</v>
+                                    <v>3265</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>44</b>
-                                    <v>3264</v>
+                                    <v>3265</v>
                                 </b>
                                 <b>
                                     <a>44</a>
@@ -6545,11 +6560,11 @@
         </relation>
         <relation>
             <name>locations_stmt</name>
-            <cardinality>3820105</cardinality>
+            <cardinality>3820076</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3820105</v>
+                    <v>3820076</v>
                 </e>
                 <e>
                     <k>container</k>
@@ -6557,7 +6572,7 @@
                 </e>
                 <e>
                     <k>startLine</k>
-                    <v>200183</v>
+                    <v>200182</v>
                 </e>
                 <e>
                     <k>startColumn</k>
@@ -6565,7 +6580,7 @@
                 </e>
                 <e>
                     <k>endLine</k>
-                    <v>194439</v>
+                    <v>194437</v>
                 </e>
                 <e>
                     <k>endColumn</k>
@@ -6583,7 +6598,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3820105</v>
+                                    <v>3820076</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6599,7 +6614,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3820105</v>
+                                    <v>3820076</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6615,7 +6630,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3820105</v>
+                                    <v>3820076</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6631,7 +6646,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3820105</v>
+                                    <v>3820076</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6647,7 +6662,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3820105</v>
+                                    <v>3820076</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7098,7 +7113,7 @@
                                 <b>
                                     <a>37</a>
                                     <b>45</b>
-                                    <v>15112</v>
+                                    <v>15111</v>
                                 </b>
                                 <b>
                                     <a>45</a>
@@ -7139,7 +7154,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>14412</v>
+                                    <v>14411</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -7276,7 +7291,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>18468</v>
+                                    <v>18467</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -7321,7 +7336,7 @@
                                 <b>
                                     <a>12</a>
                                     <b>14</b>
-                                    <v>15812</v>
+                                    <v>15811</v>
                                 </b>
                                 <b>
                                     <a>14</a>
@@ -7342,7 +7357,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22174</v>
+                                    <v>22173</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -7798,7 +7813,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>11509</v>
+                                    <v>11508</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -7869,7 +7884,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>16162</v>
+                                    <v>16161</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -7889,7 +7904,7 @@
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>15915</v>
+                                    <v>15914</v>
                                 </b>
                                 <b>
                                     <a>11</a>
@@ -7935,7 +7950,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>32530</v>
+                                    <v>32529</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -8016,7 +8031,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>16862</v>
+                                    <v>16861</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -8031,7 +8046,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>20465</v>
+                                    <v>20464</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -8082,7 +8097,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>12559</v>
+                                    <v>12558</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -8117,7 +8132,7 @@
                                 <b>
                                     <a>19</a>
                                     <b>22</b>
-                                    <v>14062</v>
+                                    <v>14061</v>
                                 </b>
                                 <b>
                                     <a>22</a>
@@ -8527,11 +8542,11 @@
         </relation>
         <relation>
             <name>locations_expr</name>
-            <cardinality>13188716</cardinality>
+            <cardinality>13188614</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>13188716</v>
+                    <v>13188614</v>
                 </e>
                 <e>
                     <k>container</k>
@@ -8539,7 +8554,7 @@
                 </e>
                 <e>
                     <k>startLine</k>
-                    <v>192236</v>
+                    <v>192235</v>
                 </e>
                 <e>
                     <k>startColumn</k>
@@ -8547,7 +8562,7 @@
                 </e>
                 <e>
                     <k>endLine</k>
-                    <v>192215</v>
+                    <v>192214</v>
                 </e>
                 <e>
                     <k>endColumn</k>
@@ -8565,7 +8580,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13188716</v>
+                                    <v>13188614</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8581,7 +8596,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13188716</v>
+                                    <v>13188614</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8597,7 +8612,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13188716</v>
+                                    <v>13188614</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8613,7 +8628,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13188716</v>
+                                    <v>13188614</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8629,7 +8644,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13188716</v>
+                                    <v>13188614</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9050,7 +9065,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>9</b>
-                                    <v>16512</v>
+                                    <v>16511</v>
                                 </b>
                                 <b>
                                     <a>9</a>
@@ -9202,7 +9217,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>11</b>
-                                    <v>16718</v>
+                                    <v>16717</v>
                                 </b>
                                 <b>
                                     <a>11</a>
@@ -9268,7 +9283,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>44698</v>
+                                    <v>44697</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -9339,7 +9354,7 @@
                                 <b>
                                     <a>38</a>
                                     <b>43</b>
-                                    <v>15565</v>
+                                    <v>15564</v>
                                 </b>
                                 <b>
                                     <a>43</a>
@@ -9760,12 +9775,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>5</b>
-                                    <v>16162</v>
+                                    <v>16161</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>9</b>
-                                    <v>16512</v>
+                                    <v>16511</v>
                                 </b>
                                 <b>
                                     <a>9</a>
@@ -9775,7 +9790,7 @@
                                 <b>
                                     <a>15</a>
                                     <b>23</b>
-                                    <v>15112</v>
+                                    <v>15111</v>
                                 </b>
                                 <b>
                                     <a>23</a>
@@ -9785,12 +9800,12 @@
                                 <b>
                                     <a>32</a>
                                     <b>44</b>
-                                    <v>14762</v>
+                                    <v>14761</v>
                                 </b>
                                 <b>
                                     <a>44</a>
                                     <b>60</b>
-                                    <v>14515</v>
+                                    <v>14514</v>
                                 </b>
                                 <b>
                                     <a>60</a>
@@ -9912,17 +9927,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>95634</v>
+                                    <v>95633</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>50092</v>
+                                    <v>50091</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>29421</v>
+                                    <v>29420</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -9958,7 +9973,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>11</b>
-                                    <v>16512</v>
+                                    <v>16511</v>
                                 </b>
                                 <b>
                                     <a>11</a>
@@ -10059,7 +10074,7 @@
                                 <b>
                                     <a>38</a>
                                     <b>43</b>
-                                    <v>16162</v>
+                                    <v>16161</v>
                                 </b>
                                 <b>
                                     <a>43</a>
@@ -10459,23 +10474,23 @@
         </relation>
         <relation>
             <name>numlines</name>
-            <cardinality>1382466</cardinality>
+            <cardinality>1382525</cardinality>
             <columnsizes>
                 <e>
                     <k>element_id</k>
-                    <v>1375469</v>
+                    <v>1375529</v>
                 </e>
                 <e>
                     <k>num_lines</k>
-                    <v>101679</v>
+                    <v>101683</v>
                 </e>
                 <e>
                     <k>num_code</k>
-                    <v>84888</v>
+                    <v>84891</v>
                 </e>
                 <e>
                     <k>num_comment</k>
-                    <v>59701</v>
+                    <v>59704</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10489,7 +10504,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1368473</v>
+                                    <v>1368532</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10510,7 +10525,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1369406</v>
+                                    <v>1369465</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10531,7 +10546,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1375469</v>
+                                    <v>1375529</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10547,17 +10562,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>68097</v>
+                                    <v>68100</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12126</v>
+                                    <v>12127</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>7462</v>
+                                    <v>7463</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -10583,12 +10598,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>70429</v>
+                                    <v>70432</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12126</v>
+                                    <v>12127</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -10619,22 +10634,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>69496</v>
+                                    <v>69499</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>14925</v>
+                                    <v>14926</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>10727</v>
+                                    <v>10728</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>6529</v>
+                                    <v>6530</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10650,22 +10665,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52705</v>
+                                    <v>52707</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>14458</v>
+                                    <v>14459</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>6529</v>
+                                    <v>6530</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>42</b>
-                                    <v>6529</v>
+                                    <v>6530</v>
                                 </b>
                                 <b>
                                     <a>44</a>
@@ -10686,7 +10701,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52705</v>
+                                    <v>52707</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10701,7 +10716,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>6529</v>
+                                    <v>6530</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -10722,7 +10737,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53171</v>
+                                    <v>53174</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10732,7 +10747,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>7462</v>
+                                    <v>7463</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -10742,7 +10757,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>10</b>
-                                    <v>3264</v>
+                                    <v>3265</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10758,7 +10773,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>34515</v>
+                                    <v>34516</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10799,7 +10814,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>34515</v>
+                                    <v>34516</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10840,7 +10855,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>34515</v>
+                                    <v>34516</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10875,11 +10890,11 @@
         </relation>
         <relation>
             <name>diagnostics</name>
-            <cardinality>5013</cardinality>
+            <cardinality>5001</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5013</v>
+                    <v>5001</v>
                 </e>
                 <e>
                     <k>severity</k>
@@ -10891,11 +10906,11 @@
                 </e>
                 <e>
                     <k>error_message</k>
-                    <v>400</v>
+                    <v>399</v>
                 </e>
                 <e>
                     <k>full_error_message</k>
-                    <v>4213</v>
+                    <v>4202</v>
                 </e>
                 <e>
                     <k>location</k>
@@ -10913,7 +10928,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5013</v>
+                                    <v>5001</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10929,7 +10944,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5013</v>
+                                    <v>5001</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10945,7 +10960,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5013</v>
+                                    <v>5001</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10961,7 +10976,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5013</v>
+                                    <v>5001</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10977,7 +10992,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5013</v>
+                                    <v>5001</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11209,7 +11224,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>400</v>
+                                    <v>399</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11225,7 +11240,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>400</v>
+                                    <v>399</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11303,7 +11318,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4194</v>
+                                    <v>4183</v>
                                 </b>
                                 <b>
                                     <a>43</a>
@@ -11324,7 +11339,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4213</v>
+                                    <v>4202</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11340,7 +11355,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4213</v>
+                                    <v>4202</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11356,7 +11371,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4213</v>
+                                    <v>4202</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11372,7 +11387,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4213</v>
+                                    <v>4202</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11507,15 +11522,15 @@
         </relation>
         <relation>
             <name>files</name>
-            <cardinality>123134</cardinality>
+            <cardinality>123139</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>123134</v>
+                    <v>123139</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>123134</v>
+                    <v>123139</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11529,7 +11544,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>123134</v>
+                                    <v>123139</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11545,7 +11560,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>123134</v>
+                                    <v>123139</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11555,15 +11570,15 @@
         </relation>
         <relation>
             <name>folders</name>
-            <cardinality>16324</cardinality>
+            <cardinality>16325</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>16324</v>
+                    <v>16325</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>16324</v>
+                    <v>16325</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11577,7 +11592,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16324</v>
+                                    <v>16325</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11593,7 +11608,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16324</v>
+                                    <v>16325</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11603,15 +11618,15 @@
         </relation>
         <relation>
             <name>containerparent</name>
-            <cardinality>138526</cardinality>
+            <cardinality>138532</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>16324</v>
+                    <v>16325</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>138526</v>
+                    <v>138532</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11625,12 +11640,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7462</v>
+                                    <v>7463</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3264</v>
+                                    <v>3265</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -11666,7 +11681,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>138526</v>
+                                    <v>138532</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11676,11 +11691,11 @@
         </relation>
         <relation>
             <name>fileannotations</name>
-            <cardinality>5084962</cardinality>
+            <cardinality>5083033</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4856</v>
+                    <v>4855</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -11688,11 +11703,11 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>54298</v>
+                    <v>54277</v>
                 </e>
                 <e>
                     <k>value</k>
-                    <v>45647</v>
+                    <v>45630</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11711,7 +11726,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4688</v>
+                                    <v>4687</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11772,7 +11787,7 @@
                                 <b>
                                     <a>936</a>
                                     <b>937</b>
-                                    <v>1410</v>
+                                    <v>1409</v>
                                 </b>
                                 <b>
                                     <a>1083</a>
@@ -11838,7 +11853,7 @@
                                 <b>
                                     <a>1501</a>
                                     <b>1502</b>
-                                    <v>1410</v>
+                                    <v>1409</v>
                                 </b>
                                 <b>
                                     <a>1504</a>
@@ -11848,7 +11863,7 @@
                                 <b>
                                     <a>1972</a>
                                     <b>4080</b>
-                                    <v>235</v>
+                                    <v>234</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11927,57 +11942,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8784</v>
+                                    <v>8781</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6166</v>
+                                    <v>6163</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>4140</v>
+                                    <v>4139</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>9</b>
-                                    <v>4230</v>
+                                    <v>4228</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>14</b>
-                                    <v>3950</v>
+                                    <v>3948</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>18</b>
-                                    <v>4140</v>
+                                    <v>4139</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>20</b>
-                                    <v>4677</v>
+                                    <v>4676</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>34</b>
-                                    <v>4185</v>
+                                    <v>4183</v>
                                 </b>
                                 <b>
                                     <a>34</a>
                                     <b>128</b>
-                                    <v>4465</v>
+                                    <v>4463</v>
                                 </b>
                                 <b>
                                     <a>128</a>
                                     <b>229</b>
-                                    <v>4084</v>
+                                    <v>4083</v>
                                 </b>
                                 <b>
                                     <a>229</a>
                                     <b>387</b>
-                                    <v>4207</v>
+                                    <v>4206</v>
                                 </b>
                                 <b>
                                     <a>387</a>
@@ -11998,7 +12013,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>54298</v>
+                                    <v>54277</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12014,62 +12029,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8796</v>
+                                    <v>8792</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7990</v>
+                                    <v>7987</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2540</v>
+                                    <v>2539</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>4476</v>
+                                    <v>4474</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>4095</v>
+                                    <v>4094</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>14</b>
-                                    <v>4174</v>
+                                    <v>4172</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>17</b>
-                                    <v>4095</v>
+                                    <v>4094</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>22</b>
-                                    <v>4554</v>
+                                    <v>4552</v>
                                 </b>
                                 <b>
                                     <a>22</a>
                                     <b>41</b>
-                                    <v>4174</v>
+                                    <v>4172</v>
                                 </b>
                                 <b>
                                     <a>41</a>
                                     <b>82</b>
-                                    <v>4129</v>
+                                    <v>4127</v>
                                 </b>
                                 <b>
                                     <a>82</a>
                                     <b>157</b>
-                                    <v>4073</v>
+                                    <v>4071</v>
                                 </b>
                                 <b>
                                     <a>158</a>
                                     <b>1895</b>
-                                    <v>1197</v>
+                                    <v>1196</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12085,62 +12100,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7095</v>
+                                    <v>7092</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>2215</v>
+                                    <v>2214</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>3301</v>
+                                    <v>3300</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>15</b>
-                                    <v>3502</v>
+                                    <v>3501</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>17</b>
-                                    <v>2517</v>
+                                    <v>2516</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>19</b>
-                                    <v>4107</v>
+                                    <v>4105</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>34</b>
-                                    <v>3301</v>
+                                    <v>3300</v>
                                 </b>
                                 <b>
                                     <a>34</a>
                                     <b>189</b>
-                                    <v>3592</v>
+                                    <v>3590</v>
                                 </b>
                                 <b>
                                     <a>189</a>
                                     <b>201</b>
-                                    <v>3581</v>
+                                    <v>3579</v>
                                 </b>
                                 <b>
                                     <a>201</a>
                                     <b>266</b>
-                                    <v>3525</v>
+                                    <v>3523</v>
                                 </b>
                                 <b>
                                     <a>266</a>
                                     <b>321</b>
-                                    <v>3648</v>
+                                    <v>3646</v>
                                 </b>
                                 <b>
                                     <a>322</a>
                                     <b>399</b>
-                                    <v>3916</v>
+                                    <v>3915</v>
                                 </b>
                                 <b>
                                     <a>399</a>
@@ -12161,7 +12176,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>45636</v>
+                                    <v>45619</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12182,67 +12197,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7117</v>
+                                    <v>7114</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>2562</v>
+                                    <v>2561</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>3480</v>
+                                    <v>3479</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>15</b>
-                                    <v>3525</v>
+                                    <v>3523</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>17</b>
-                                    <v>2808</v>
+                                    <v>2807</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>19</b>
-                                    <v>3558</v>
+                                    <v>3557</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>29</b>
-                                    <v>3480</v>
+                                    <v>3479</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>39</b>
-                                    <v>3637</v>
+                                    <v>3635</v>
                                 </b>
                                 <b>
                                     <a>39</a>
                                     <b>48</b>
-                                    <v>3581</v>
+                                    <v>3579</v>
                                 </b>
                                 <b>
                                     <a>48</a>
                                     <b>74</b>
-                                    <v>3536</v>
+                                    <v>3534</v>
                                 </b>
                                 <b>
                                     <a>74</a>
                                     <b>102</b>
-                                    <v>3424</v>
+                                    <v>3423</v>
                                 </b>
                                 <b>
                                     <a>102</a>
                                     <b>119</b>
-                                    <v>3569</v>
+                                    <v>3568</v>
                                 </b>
                                 <b>
                                     <a>119</a>
                                     <b>146</b>
-                                    <v>1365</v>
+                                    <v>1364</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12252,15 +12267,15 @@
         </relation>
         <relation>
             <name>inmacroexpansion</name>
-            <cardinality>109785545</cardinality>
+            <cardinality>109784721</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>18028412</v>
+                    <v>18028276</v>
                 </e>
                 <e>
                     <k>inv</k>
-                    <v>2700329</v>
+                    <v>2700307</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12274,37 +12289,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>3</b>
-                                    <v>1582049</v>
+                                    <v>1582036</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>1077861</v>
+                                    <v>1077853</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>1184952</v>
+                                    <v>1184943</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>4820205</v>
+                                    <v>4820169</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>6386332</v>
+                                    <v>6386284</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>2605405</v>
+                                    <v>2605386</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>21</b>
-                                    <v>371604</v>
+                                    <v>371602</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12320,32 +12335,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>378447</v>
+                                    <v>378443</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>544135</v>
+                                    <v>544126</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>351535</v>
+                                    <v>351533</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>200670</v>
+                                    <v>200669</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>207164</v>
+                                    <v>207162</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>241902</v>
+                                    <v>241901</v>
                                 </b>
                                 <b>
                                     <a>9</a>
@@ -12355,17 +12370,17 @@
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>325505</v>
+                                    <v>325503</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>337</b>
-                                    <v>224864</v>
+                                    <v>224867</v>
                                 </b>
                                 <b>
                                     <a>339</a>
                                     <b>423</b>
-                                    <v>206365</v>
+                                    <v>206363</v>
                                 </b>
                                 <b>
                                     <a>423</a>
@@ -12380,15 +12395,15 @@
         </relation>
         <relation>
             <name>affectedbymacroexpansion</name>
-            <cardinality>35691161</cardinality>
+            <cardinality>35690892</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5157043</v>
+                    <v>5157002</v>
                 </e>
                 <e>
                     <k>inv</k>
-                    <v>2784936</v>
+                    <v>2784914</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12402,37 +12417,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2816098</v>
+                                    <v>2816076</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>560161</v>
+                                    <v>560157</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>264922</v>
+                                    <v>264920</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>565827</v>
+                                    <v>565823</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>12</b>
-                                    <v>391926</v>
+                                    <v>391923</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>50</b>
-                                    <v>407425</v>
+                                    <v>407422</v>
                                 </b>
                                 <b>
                                     <a>50</a>
                                     <b>9900</b>
-                                    <v>150681</v>
+                                    <v>150680</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12448,62 +12463,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>4</b>
-                                    <v>229130</v>
+                                    <v>229127</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>231802</v>
+                                    <v>231800</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>220491</v>
+                                    <v>220489</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>12</b>
-                                    <v>251102</v>
+                                    <v>251100</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>13</b>
-                                    <v>333997</v>
+                                    <v>333995</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>165598</v>
+                                    <v>165596</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>15</b>
-                                    <v>298861</v>
+                                    <v>298859</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>16</b>
-                                    <v>121850</v>
+                                    <v>121849</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>17</b>
-                                    <v>276624</v>
+                                    <v>276622</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>18</b>
-                                    <v>146949</v>
+                                    <v>146948</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>20</b>
-                                    <v>252149</v>
+                                    <v>252148</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>25</b>
-                                    <v>208991</v>
+                                    <v>208989</v>
                                 </b>
                                 <b>
                                     <a>25</a>
@@ -12518,19 +12533,19 @@
         </relation>
         <relation>
             <name>macroinvocations</name>
-            <cardinality>33202987</cardinality>
+            <cardinality>33190389</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>33202987</v>
+                    <v>33190389</v>
                 </e>
                 <e>
                     <k>macro_id</k>
-                    <v>78795</v>
+                    <v>78765</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>753796</v>
+                    <v>753510</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -12548,7 +12563,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33202987</v>
+                                    <v>33190389</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12564,7 +12579,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33202987</v>
+                                    <v>33190389</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12580,7 +12595,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33202987</v>
+                                    <v>33190389</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12596,52 +12611,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16114</v>
+                                    <v>16108</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>16428</v>
+                                    <v>16421</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>3088</v>
+                                    <v>3087</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>5226</v>
+                                    <v>5224</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>5640</v>
+                                    <v>5638</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>13</b>
-                                    <v>6054</v>
+                                    <v>6051</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>26</b>
-                                    <v>6121</v>
+                                    <v>6119</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>61</b>
-                                    <v>6009</v>
+                                    <v>6007</v>
                                 </b>
                                 <b>
                                     <a>61</a>
                                     <b>199</b>
-                                    <v>5919</v>
+                                    <v>5917</v>
                                 </b>
                                 <b>
                                     <a>199</a>
                                     <b>1697</b>
-                                    <v>5964</v>
+                                    <v>5962</v>
                                 </b>
                                 <b>
                                     <a>1716</a>
@@ -12662,37 +12677,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>42100</v>
+                                    <v>42084</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10306</v>
+                                    <v>10302</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5114</v>
+                                    <v>5112</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>6781</v>
+                                    <v>6779</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>13</b>
-                                    <v>6423</v>
+                                    <v>6421</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>66</b>
-                                    <v>5953</v>
+                                    <v>5951</v>
                                 </b>
                                 <b>
                                     <a>66</a>
                                     <b>3614</b>
-                                    <v>2115</v>
+                                    <v>2114</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12708,12 +12723,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73110</v>
+                                    <v>73082</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5684</v>
+                                    <v>5682</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12729,37 +12744,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>278787</v>
+                                    <v>278681</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>168154</v>
+                                    <v>168090</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>70144</v>
+                                    <v>70117</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>59770</v>
+                                    <v>59747</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>9</b>
-                                    <v>69786</v>
+                                    <v>69759</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>21</b>
-                                    <v>58595</v>
+                                    <v>58573</v>
                                 </b>
                                 <b>
                                     <a>21</a>
                                     <b>244764</b>
-                                    <v>48557</v>
+                                    <v>48538</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12775,12 +12790,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>708025</v>
+                                    <v>707756</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>350</b>
-                                    <v>45770</v>
+                                    <v>45753</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12796,7 +12811,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>753796</v>
+                                    <v>753510</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12869,15 +12884,15 @@
         </relation>
         <relation>
             <name>macroparent</name>
-            <cardinality>29691721</cardinality>
+            <cardinality>29680455</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>29691721</v>
+                    <v>29680455</v>
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>23085760</v>
+                    <v>23077000</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12891,7 +12906,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29691721</v>
+                                    <v>29680455</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12907,17 +12922,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17837443</v>
+                                    <v>17830675</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4420895</v>
+                                    <v>4419217</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>88</b>
-                                    <v>827421</v>
+                                    <v>827107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12927,15 +12942,15 @@
         </relation>
         <relation>
             <name>macrolocationbind</name>
-            <cardinality>4044034</cardinality>
+            <cardinality>4043998</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2831314</v>
+                    <v>2831290</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2021186</v>
+                    <v>2021169</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12949,17 +12964,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2230051</v>
+                                    <v>2230032</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>341145</v>
+                                    <v>341142</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>230539</v>
+                                    <v>230537</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -12980,22 +12995,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1611118</v>
+                                    <v>1611104</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>177692</v>
+                                    <v>177691</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>156878</v>
+                                    <v>156877</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>723</b>
-                                    <v>75497</v>
+                                    <v>75496</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13005,11 +13020,11 @@
         </relation>
         <relation>
             <name>macro_argument_unexpanded</name>
-            <cardinality>83818746</cardinality>
+            <cardinality>83786944</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>25989002</v>
+                    <v>25979141</v>
                 </e>
                 <e>
                     <k>argument_index</k>
@@ -13017,7 +13032,7 @@
                 </e>
                 <e>
                     <k>text</k>
-                    <v>315549</v>
+                    <v>315429</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13031,22 +13046,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7368800</v>
+                                    <v>7366004</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10582220</v>
+                                    <v>10578205</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6086111</v>
+                                    <v>6083801</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1951870</v>
+                                    <v>1951130</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13062,22 +13077,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7438351</v>
+                                    <v>7435529</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10727500</v>
+                                    <v>10723430</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5921224</v>
+                                    <v>5918977</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1901925</v>
+                                    <v>1901204</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13093,7 +13108,7 @@
                                 <b>
                                     <a>41230</a>
                                     <b>41231</b>
-                                    <v>649</v>
+                                    <v>648</v>
                                 </b>
                                 <b>
                                     <a>41432</a>
@@ -13119,7 +13134,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>649</v>
+                                    <v>648</v>
                                 </b>
                                 <b>
                                     <a>13</a>
@@ -13145,57 +13160,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>34770</v>
+                                    <v>34756</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>60732</v>
+                                    <v>60709</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>17592</v>
+                                    <v>17585</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>44674</v>
+                                    <v>44657</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>23713</v>
+                                    <v>23704</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>12</b>
-                                    <v>18364</v>
+                                    <v>18357</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>16</b>
-                                    <v>21430</v>
+                                    <v>21422</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>23</b>
-                                    <v>24765</v>
+                                    <v>24756</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>42</b>
-                                    <v>24116</v>
+                                    <v>24107</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>129</b>
-                                    <v>23870</v>
+                                    <v>23861</v>
                                 </b>
                                 <b>
                                     <a>129</a>
                                     <b>522417</b>
-                                    <v>21520</v>
+                                    <v>21511</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13211,17 +13226,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>228204</v>
+                                    <v>228118</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>77150</v>
+                                    <v>77120</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>10194</v>
+                                    <v>10191</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13231,11 +13246,11 @@
         </relation>
         <relation>
             <name>macro_argument_expanded</name>
-            <cardinality>83818746</cardinality>
+            <cardinality>83786944</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>25989002</v>
+                    <v>25979141</v>
                 </e>
                 <e>
                     <k>argument_index</k>
@@ -13243,7 +13258,7 @@
                 </e>
                 <e>
                     <k>text</k>
-                    <v>191229</v>
+                    <v>191157</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13257,22 +13272,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7368800</v>
+                                    <v>7366004</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10582220</v>
+                                    <v>10578205</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6086111</v>
+                                    <v>6083801</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1951870</v>
+                                    <v>1951130</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13288,22 +13303,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10597171</v>
+                                    <v>10593150</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9122547</v>
+                                    <v>9119085</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5163131</v>
+                                    <v>5161172</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>1106152</v>
+                                    <v>1105732</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13319,7 +13334,7 @@
                                 <b>
                                     <a>41230</a>
                                     <b>41231</b>
-                                    <v>649</v>
+                                    <v>648</v>
                                 </b>
                                 <b>
                                     <a>41432</a>
@@ -13371,62 +13386,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20613</v>
+                                    <v>20605</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>36985</v>
+                                    <v>36971</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>8986</v>
+                                    <v>8982</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>16237</v>
+                                    <v>16231</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>2394</v>
+                                    <v>2393</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>22650</v>
+                                    <v>22641</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>14671</v>
+                                    <v>14665</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>14</b>
-                                    <v>11940</v>
+                                    <v>11936</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>19</b>
-                                    <v>14425</v>
+                                    <v>14419</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>48</b>
-                                    <v>14346</v>
+                                    <v>14341</v>
                                 </b>
                                 <b>
                                     <a>48</a>
                                     <b>151</b>
-                                    <v>14357</v>
+                                    <v>14352</v>
                                 </b>
                                 <b>
                                     <a>152</a>
                                     <b>1060462</b>
-                                    <v>13619</v>
+                                    <v>13614</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13442,17 +13457,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>96778</v>
+                                    <v>96742</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>80171</v>
+                                    <v>80141</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>66</b>
-                                    <v>14279</v>
+                                    <v>14274</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13462,19 +13477,19 @@
         </relation>
         <relation>
             <name>functions</name>
-            <cardinality>4646000</cardinality>
+            <cardinality>4646200</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4646000</v>
+                    <v>4646200</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1916982</v>
+                    <v>1917064</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>3264</v>
+                    <v>3265</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13488,7 +13503,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4646000</v>
+                                    <v>4646200</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13504,7 +13519,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4646000</v>
+                                    <v>4646200</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13520,22 +13535,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1504201</v>
+                                    <v>1504266</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>152052</v>
+                                    <v>152059</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>150186</v>
+                                    <v>150193</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>1676</b>
-                                    <v>110541</v>
+                                    <v>110546</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13551,7 +13566,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1916516</v>
+                                    <v>1916598</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13658,15 +13673,15 @@
         </relation>
         <relation>
             <name>function_entry_point</name>
-            <cardinality>1156719</cardinality>
+            <cardinality>1156769</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1146924</v>
+                    <v>1146973</v>
                 </e>
                 <e>
                     <k>entry_point</k>
-                    <v>1156719</v>
+                    <v>1156769</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13680,12 +13695,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1137129</v>
+                                    <v>1137178</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9794</v>
+                                    <v>9795</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13701,7 +13716,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1156719</v>
+                                    <v>1156769</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13711,15 +13726,15 @@
         </relation>
         <relation>
             <name>function_return_type</name>
-            <cardinality>4651131</cardinality>
+            <cardinality>4651331</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4646000</v>
+                    <v>4646200</v>
                 </e>
                 <e>
                     <k>return_type</k>
-                    <v>987409</v>
+                    <v>987451</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13733,7 +13748,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4640870</v>
+                                    <v>4641069</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13754,22 +13769,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>510262</v>
+                                    <v>510284</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>375933</v>
+                                    <v>375949</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>10</b>
-                                    <v>75093</v>
+                                    <v>75096</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>2516</b>
-                                    <v>26119</v>
+                                    <v>26120</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14091,59 +14106,59 @@
         </relation>
         <relation>
             <name>purefunctions</name>
-            <cardinality>100917</cardinality>
+            <cardinality>100915</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>100917</v>
+                    <v>100915</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_deleted</name>
-            <cardinality>137593</cardinality>
+            <cardinality>137599</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>137593</v>
+                    <v>137599</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_defaulted</name>
-            <cardinality>73694</cardinality>
+            <cardinality>73697</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>73694</v>
+                    <v>73697</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_prototyped</name>
-            <cardinality>4554116</cardinality>
+            <cardinality>4554311</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4554116</v>
+                    <v>4554311</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>member_function_this_type</name>
-            <cardinality>546094</cardinality>
+            <cardinality>545957</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>546094</v>
+                    <v>545957</v>
                 </e>
                 <e>
                     <k>this_type</k>
-                    <v>187436</v>
+                    <v>187389</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14157,7 +14172,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>546094</v>
+                                    <v>545957</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14173,32 +14188,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>67674</v>
+                                    <v>67657</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>44849</v>
+                                    <v>44838</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>30201</v>
+                                    <v>30193</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>15344</v>
+                                    <v>15340</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>15379</v>
+                                    <v>15375</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>66</b>
-                                    <v>13987</v>
+                                    <v>13983</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14208,27 +14223,27 @@
         </relation>
         <relation>
             <name>fun_decls</name>
-            <cardinality>5014938</cardinality>
+            <cardinality>5015153</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5009807</v>
+                    <v>5010023</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>4502343</v>
+                    <v>4502537</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>986009</v>
+                    <v>986052</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1819500</v>
+                    <v>1819579</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>3418385</v>
+                    <v>3418532</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14242,7 +14257,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5009807</v>
+                                    <v>5010023</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14258,7 +14273,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5004676</v>
+                                    <v>5004892</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14279,7 +14294,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5009807</v>
+                                    <v>5010023</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14295,7 +14310,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5009807</v>
+                                    <v>5010023</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14311,17 +14326,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4073704</v>
+                                    <v>4073879</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>355877</v>
+                                    <v>355893</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>72761</v>
+                                    <v>72764</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14337,12 +14352,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4462697</v>
+                                    <v>4462889</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>39645</v>
+                                    <v>39647</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14358,7 +14373,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4502343</v>
+                                    <v>4502537</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14374,12 +14389,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4130141</v>
+                                    <v>4130318</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>371269</v>
+                                    <v>371285</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -14400,22 +14415,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>435635</v>
+                                    <v>435654</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>438433</v>
+                                    <v>438452</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>75093</v>
+                                    <v>75096</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>2761</b>
-                                    <v>36847</v>
+                                    <v>36848</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14431,22 +14446,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>519590</v>
+                                    <v>519613</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>367538</v>
+                                    <v>367554</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>11</b>
-                                    <v>75559</v>
+                                    <v>75563</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>2477</b>
-                                    <v>23320</v>
+                                    <v>23321</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14462,17 +14477,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>858677</v>
+                                    <v>858714</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>89552</v>
+                                    <v>89556</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>823</b>
-                                    <v>37779</v>
+                                    <v>37781</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14488,22 +14503,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>754666</v>
+                                    <v>754698</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>131530</v>
+                                    <v>131535</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>10</b>
-                                    <v>74627</v>
+                                    <v>74630</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>2030</b>
-                                    <v>25186</v>
+                                    <v>25187</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14519,27 +14534,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1234611</v>
+                                    <v>1234664</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>266791</v>
+                                    <v>266803</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>80690</v>
+                                    <v>80693</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>136660</v>
+                                    <v>136666</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>1710</b>
-                                    <v>100746</v>
+                                    <v>100750</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14555,22 +14570,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1413716</v>
+                                    <v>1413777</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>151119</v>
+                                    <v>151126</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>144123</v>
+                                    <v>144129</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>1660</b>
-                                    <v>110541</v>
+                                    <v>110546</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14586,17 +14601,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1601216</v>
+                                    <v>1601285</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>134795</v>
+                                    <v>134800</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>930</b>
-                                    <v>83489</v>
+                                    <v>83492</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14612,27 +14627,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1255600</v>
+                                    <v>1255654</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>293377</v>
+                                    <v>293390</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>79757</v>
+                                    <v>79761</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>137593</v>
+                                    <v>137599</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>653</b>
-                                    <v>53171</v>
+                                    <v>53174</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14648,17 +14663,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2962227</v>
+                                    <v>2962355</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>296176</v>
+                                    <v>296188</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>55</b>
-                                    <v>159981</v>
+                                    <v>159988</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14674,17 +14689,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3029392</v>
+                                    <v>3029522</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>262593</v>
+                                    <v>262605</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>55</b>
-                                    <v>126399</v>
+                                    <v>126405</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14700,12 +14715,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3208496</v>
+                                    <v>3208634</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>25</b>
-                                    <v>209888</v>
+                                    <v>209897</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14721,12 +14736,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3246276</v>
+                                    <v>3246416</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>13</b>
-                                    <v>172108</v>
+                                    <v>172116</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14736,22 +14751,22 @@
         </relation>
         <relation>
             <name>fun_def</name>
-            <cardinality>1935172</cardinality>
+            <cardinality>1935256</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1935172</v>
+                    <v>1935256</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>fun_specialized</name>
-            <cardinality>26119</cardinality>
+            <cardinality>26120</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>26119</v>
+                    <v>26120</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -14769,11 +14784,11 @@
         </relation>
         <relation>
             <name>fun_decl_specifiers</name>
-            <cardinality>2903925</cardinality>
+            <cardinality>2904050</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1687970</v>
+                    <v>1688043</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -14791,17 +14806,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>490672</v>
+                                    <v>490693</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1178641</v>
+                                    <v>1178691</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>18656</v>
+                                    <v>18657</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14973,26 +14988,26 @@
         </relation>
         <relation>
             <name>fun_decl_empty_throws</name>
-            <cardinality>1933773</cardinality>
+            <cardinality>1933856</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>1933773</v>
+                    <v>1933856</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>fun_decl_noexcept</name>
-            <cardinality>60559</cardinality>
+            <cardinality>60528</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>60559</v>
+                    <v>60528</v>
                 </e>
                 <e>
                     <k>constant</k>
-                    <v>60456</v>
+                    <v>60424</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -15006,7 +15021,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>60559</v>
+                                    <v>60528</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15022,7 +15037,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>60352</v>
+                                    <v>60321</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15037,11 +15052,11 @@
         </relation>
         <relation>
             <name>fun_decl_empty_noexcept</name>
-            <cardinality>869871</cardinality>
+            <cardinality>869909</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>869871</v>
+                    <v>869909</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -15146,11 +15161,11 @@
         </relation>
         <relation>
             <name>param_decl_bind</name>
-            <cardinality>7379682</cardinality>
+            <cardinality>7380000</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7379682</v>
+                    <v>7380000</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -15158,7 +15173,7 @@
                 </e>
                 <e>
                     <k>fun_decl</k>
-                    <v>4222958</v>
+                    <v>4223140</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -15172,7 +15187,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7379682</v>
+                                    <v>7380000</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15188,7 +15203,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7379682</v>
+                                    <v>7380000</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15366,22 +15381,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2363345</v>
+                                    <v>2363447</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1060637</v>
+                                    <v>1060682</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>502333</v>
+                                    <v>502354</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>18</b>
-                                    <v>296642</v>
+                                    <v>296655</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15397,22 +15412,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2363345</v>
+                                    <v>2363447</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1060637</v>
+                                    <v>1060682</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>502333</v>
+                                    <v>502354</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>18</b>
-                                    <v>296642</v>
+                                    <v>296655</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15422,27 +15437,27 @@
         </relation>
         <relation>
             <name>var_decls</name>
-            <cardinality>8493958</cardinality>
+            <cardinality>8494323</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>8423062</v>
+                    <v>8423424</v>
                 </e>
                 <e>
                     <k>variable</k>
-                    <v>7411865</v>
+                    <v>7412184</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>2384334</v>
+                    <v>2384436</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>666979</v>
+                    <v>667007</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5306916</v>
+                    <v>5307144</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -15456,7 +15471,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8423062</v>
+                                    <v>8423424</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15472,12 +15487,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8354965</v>
+                                    <v>8355324</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>68097</v>
+                                    <v>68100</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15493,7 +15508,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8423062</v>
+                                    <v>8423424</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15509,7 +15524,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8420264</v>
+                                    <v>8420626</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15530,17 +15545,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6560651</v>
+                                    <v>6560933</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>697762</v>
+                                    <v>697792</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>153451</v>
+                                    <v>153458</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15556,12 +15571,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7240690</v>
+                                    <v>7241001</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>171175</v>
+                                    <v>171183</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15577,12 +15592,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7296660</v>
+                                    <v>7296974</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>115205</v>
+                                    <v>115210</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15598,12 +15613,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6867088</v>
+                                    <v>6867383</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>544777</v>
+                                    <v>544800</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15619,27 +15634,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1469220</v>
+                                    <v>1469283</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>509329</v>
+                                    <v>509351</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>97948</v>
+                                    <v>97952</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>187034</v>
+                                    <v>187042</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>762</b>
-                                    <v>120802</v>
+                                    <v>120807</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15655,22 +15670,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1602616</v>
+                                    <v>1602684</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>484609</v>
+                                    <v>484630</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>186567</v>
+                                    <v>186575</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>724</b>
-                                    <v>110541</v>
+                                    <v>110546</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15686,17 +15701,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1877336</v>
+                                    <v>1877417</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>384795</v>
+                                    <v>384812</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>128</b>
-                                    <v>122201</v>
+                                    <v>122207</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15712,22 +15727,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1705228</v>
+                                    <v>1705301</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>401586</v>
+                                    <v>401604</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>188433</v>
+                                    <v>188441</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>592</b>
-                                    <v>89086</v>
+                                    <v>89089</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15743,37 +15758,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>340952</v>
+                                    <v>340967</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>86753</v>
+                                    <v>86757</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>48507</v>
+                                    <v>48509</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>51772</v>
+                                    <v>51774</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>12</b>
-                                    <v>52238</v>
+                                    <v>52241</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>33</b>
-                                    <v>50373</v>
+                                    <v>50375</v>
                                 </b>
                                 <b>
                                     <a>34</a>
                                     <b>3223</b>
-                                    <v>36380</v>
+                                    <v>36382</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15789,37 +15804,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>368471</v>
+                                    <v>368486</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>77891</v>
+                                    <v>77895</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>45242</v>
+                                    <v>45244</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>49440</v>
+                                    <v>49442</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>14</b>
-                                    <v>53171</v>
+                                    <v>53174</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>56</b>
-                                    <v>50839</v>
+                                    <v>50841</v>
                                 </b>
                                 <b>
                                     <a>56</a>
                                     <b>3140</b>
-                                    <v>21921</v>
+                                    <v>21922</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15835,27 +15850,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>456624</v>
+                                    <v>456643</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>93750</v>
+                                    <v>93754</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>46641</v>
+                                    <v>46643</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>19</b>
-                                    <v>50839</v>
+                                    <v>50841</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>1927</b>
-                                    <v>19123</v>
+                                    <v>19124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15871,32 +15886,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>378732</v>
+                                    <v>378748</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>90485</v>
+                                    <v>90489</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>59701</v>
+                                    <v>59704</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>9</b>
-                                    <v>51306</v>
+                                    <v>51308</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>21</b>
-                                    <v>50373</v>
+                                    <v>50375</v>
                                 </b>
                                 <b>
                                     <a>21</a>
                                     <b>1010</b>
-                                    <v>36380</v>
+                                    <v>36382</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15912,17 +15927,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4492082</v>
+                                    <v>4492275</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>531251</v>
+                                    <v>531274</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>1735</b>
-                                    <v>283582</v>
+                                    <v>283595</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15938,17 +15953,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4881075</v>
+                                    <v>4881285</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>17</b>
-                                    <v>415112</v>
+                                    <v>415130</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>1731</b>
-                                    <v>10727</v>
+                                    <v>10728</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15964,12 +15979,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4957102</v>
+                                    <v>4957315</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1513</b>
-                                    <v>349814</v>
+                                    <v>349829</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15985,7 +16000,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5297588</v>
+                                    <v>5297815</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -16000,22 +16015,22 @@
         </relation>
         <relation>
             <name>var_def</name>
-            <cardinality>4024730</cardinality>
+            <cardinality>4024903</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4024730</v>
+                    <v>4024903</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>var_decl_specifiers</name>
-            <cardinality>310635</cardinality>
+            <cardinality>310648</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>310635</v>
+                    <v>310648</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -16033,7 +16048,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>310635</v>
+                                    <v>310648</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16080,19 +16095,19 @@
         </relation>
         <relation>
             <name>type_decls</name>
-            <cardinality>3242079</cardinality>
+            <cardinality>3242218</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3242079</v>
+                    <v>3242218</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>3191705</v>
+                    <v>3191843</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>3163254</v>
+                    <v>3163390</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16106,7 +16121,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3242079</v>
+                                    <v>3242218</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16122,7 +16137,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3242079</v>
+                                    <v>3242218</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16138,12 +16153,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3150194</v>
+                                    <v>3150330</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>41511</v>
+                                    <v>41513</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16159,12 +16174,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3150194</v>
+                                    <v>3150330</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>41511</v>
+                                    <v>41513</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16180,12 +16195,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3123142</v>
+                                    <v>3123276</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>20</b>
-                                    <v>40112</v>
+                                    <v>40113</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16201,12 +16216,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3123142</v>
+                                    <v>3123276</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>20</b>
-                                    <v>40112</v>
+                                    <v>40113</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16216,33 +16231,33 @@
         </relation>
         <relation>
             <name>type_def</name>
-            <cardinality>2624540</cardinality>
+            <cardinality>2624653</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2624540</v>
+                    <v>2624653</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>type_decl_top</name>
-            <cardinality>743005</cardinality>
+            <cardinality>743037</cardinality>
             <columnsizes>
                 <e>
                     <k>type_decl</k>
-                    <v>743005</v>
+                    <v>743037</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>namespace_decls</name>
-            <cardinality>311530</cardinality>
+            <cardinality>311523</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>311530</v>
+                    <v>311523</v>
                 </e>
                 <e>
                     <k>namespace_id</k>
@@ -16250,11 +16265,11 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>311530</v>
+                    <v>311523</v>
                 </e>
                 <e>
                     <k>bodylocation</k>
-                    <v>311530</v>
+                    <v>311523</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16268,7 +16283,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>311530</v>
+                                    <v>311523</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16284,7 +16299,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>311530</v>
+                                    <v>311523</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16300,7 +16315,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>311530</v>
+                                    <v>311523</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16514,7 +16529,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>311530</v>
+                                    <v>311523</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16530,7 +16545,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>311530</v>
+                                    <v>311523</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16546,7 +16561,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>311530</v>
+                                    <v>311523</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16562,7 +16577,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>311530</v>
+                                    <v>311523</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16578,7 +16593,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>311530</v>
+                                    <v>311523</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16594,7 +16609,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>311530</v>
+                                    <v>311523</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16604,19 +16619,19 @@
         </relation>
         <relation>
             <name>usings</name>
-            <cardinality>369403</cardinality>
+            <cardinality>369419</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>369403</v>
+                    <v>369419</v>
                 </e>
                 <e>
                     <k>element_id</k>
-                    <v>315299</v>
+                    <v>315312</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>247668</v>
+                    <v>247679</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16630,7 +16645,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>369403</v>
+                                    <v>369419</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16646,7 +16661,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>369403</v>
+                                    <v>369419</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16662,12 +16677,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>263060</v>
+                                    <v>263071</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>50839</v>
+                                    <v>50841</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -16688,12 +16703,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>263060</v>
+                                    <v>263071</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>50839</v>
+                                    <v>50841</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -16714,22 +16729,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>202425</v>
+                                    <v>202434</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>10727</v>
+                                    <v>10728</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>31250</v>
+                                    <v>31251</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>11</b>
-                                    <v>3264</v>
+                                    <v>3265</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16745,22 +16760,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>202425</v>
+                                    <v>202434</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>10727</v>
+                                    <v>10728</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>31250</v>
+                                    <v>31251</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>11</b>
-                                    <v>3264</v>
+                                    <v>3265</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16770,15 +16785,15 @@
         </relation>
         <relation>
             <name>using_container</name>
-            <cardinality>462754</cardinality>
+            <cardinality>462579</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>10955</v>
+                    <v>10951</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>293425</v>
+                    <v>293313</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16792,7 +16807,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3267</v>
+                                    <v>3266</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -16802,17 +16817,17 @@
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>414</v>
+                                    <v>413</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>2473</v>
+                                    <v>2472</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>17</b>
-                                    <v>895</v>
+                                    <v>894</v>
                                 </b>
                                 <b>
                                     <a>19</a>
@@ -16848,22 +16863,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>216420</v>
+                                    <v>216338</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>51276</v>
+                                    <v>51257</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>11</b>
-                                    <v>23612</v>
+                                    <v>23603</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>41</b>
-                                    <v>2115</v>
+                                    <v>2114</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16873,15 +16888,15 @@
         </relation>
         <relation>
             <name>static_asserts</name>
-            <cardinality>134655</cardinality>
+            <cardinality>134652</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>134655</v>
+                    <v>134652</v>
                 </e>
                 <e>
                     <k>condition</k>
-                    <v>134655</v>
+                    <v>134652</v>
                 </e>
                 <e>
                     <k>message</k>
@@ -16889,7 +16904,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>17564</v>
+                    <v>17563</v>
                 </e>
                 <e>
                     <k>enclosing</k>
@@ -16907,7 +16922,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>134655</v>
+                                    <v>134652</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16923,7 +16938,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>134655</v>
+                                    <v>134652</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16939,7 +16954,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>134655</v>
+                                    <v>134652</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16955,7 +16970,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>134655</v>
+                                    <v>134652</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16971,7 +16986,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>134655</v>
+                                    <v>134652</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16987,7 +17002,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>134655</v>
+                                    <v>134652</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17003,7 +17018,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>134655</v>
+                                    <v>134652</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17019,7 +17034,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>134655</v>
+                                    <v>134652</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17035,7 +17050,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22236</v>
+                                    <v>22235</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -17076,7 +17091,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22236</v>
+                                    <v>22235</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -17117,7 +17132,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28006</v>
+                                    <v>28005</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -17481,15 +17496,15 @@
         </relation>
         <relation>
             <name>params</name>
-            <cardinality>6739755</cardinality>
+            <cardinality>6740045</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6576042</v>
+                    <v>6576325</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>3879674</v>
+                    <v>3879840</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -17497,7 +17512,7 @@
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>2188904</v>
+                    <v>2188998</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -17511,7 +17526,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6576042</v>
+                                    <v>6576325</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17527,7 +17542,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6576042</v>
+                                    <v>6576325</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17543,12 +17558,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6452441</v>
+                                    <v>6452719</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>123601</v>
+                                    <v>123606</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17564,22 +17579,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2257002</v>
+                                    <v>2257099</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>951961</v>
+                                    <v>952002</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>429571</v>
+                                    <v>429590</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>18</b>
-                                    <v>241138</v>
+                                    <v>241149</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17595,22 +17610,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2257002</v>
+                                    <v>2257099</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>951961</v>
+                                    <v>952002</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>429571</v>
+                                    <v>429590</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>18</b>
-                                    <v>241138</v>
+                                    <v>241149</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17626,22 +17641,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2555043</v>
+                                    <v>2555153</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>826028</v>
+                                    <v>826063</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>346082</v>
+                                    <v>346097</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>152519</v>
+                                    <v>152525</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17895,22 +17910,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1488343</v>
+                                    <v>1488407</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>440299</v>
+                                    <v>440318</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>170242</v>
+                                    <v>170250</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>518</b>
-                                    <v>90018</v>
+                                    <v>90022</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17926,22 +17941,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1708026</v>
+                                    <v>1708100</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>248134</v>
+                                    <v>248145</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>168377</v>
+                                    <v>168384</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>502</b>
-                                    <v>64365</v>
+                                    <v>64368</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17957,17 +17972,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1761664</v>
+                                    <v>1761740</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>348415</v>
+                                    <v>348430</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>13</b>
-                                    <v>78824</v>
+                                    <v>78828</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17977,11 +17992,11 @@
         </relation>
         <relation>
             <name>overrides</name>
-            <cardinality>125866</cardinality>
+            <cardinality>125864</cardinality>
             <columnsizes>
                 <e>
                     <k>new</k>
-                    <v>122890</v>
+                    <v>122888</v>
                 </e>
                 <e>
                     <k>old</k>
@@ -17999,7 +18014,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>119922</v>
+                                    <v>119920</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18060,19 +18075,19 @@
         </relation>
         <relation>
             <name>membervariables</name>
-            <cardinality>1056556</cardinality>
+            <cardinality>1056548</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1054758</v>
+                    <v>1054750</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>327746</v>
+                    <v>327744</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>451645</v>
+                    <v>451642</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18086,7 +18101,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1053040</v>
+                                    <v>1053032</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18107,7 +18122,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1054758</v>
+                                    <v>1054750</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18123,7 +18138,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>243043</v>
+                                    <v>243041</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18154,12 +18169,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>255269</v>
+                                    <v>255267</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>46467</v>
+                                    <v>46466</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -18185,17 +18200,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>295343</v>
+                                    <v>295341</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>86541</v>
+                                    <v>86540</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>41193</v>
+                                    <v>41192</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -18216,12 +18231,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>367860</v>
+                                    <v>367858</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>51741</v>
+                                    <v>51740</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -18407,19 +18422,19 @@
         </relation>
         <relation>
             <name>localvariables</name>
-            <cardinality>576906</cardinality>
+            <cardinality>576895</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>576906</v>
+                    <v>576895</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>37597</v>
+                    <v>37592</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>90649</v>
+                    <v>90648</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18433,7 +18448,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>576906</v>
+                                    <v>576895</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18449,7 +18464,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>576906</v>
+                                    <v>576895</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18470,12 +18485,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5368</v>
+                                    <v>5372</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2467</v>
+                                    <v>2459</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -18485,12 +18500,12 @@
                                 <b>
                                     <a>7</a>
                                     <b>18</b>
-                                    <v>2851</v>
+                                    <v>2855</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>15849</b>
-                                    <v>2496</v>
+                                    <v>2492</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18506,17 +18521,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26772</v>
+                                    <v>26775</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4572</v>
+                                    <v>4568</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>2921</v>
+                                    <v>2917</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -18542,12 +18557,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>57095</v>
+                                    <v>57094</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>14301</v>
+                                    <v>14300</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -18557,7 +18572,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>15</b>
-                                    <v>6990</v>
+                                    <v>6989</v>
                                 </b>
                                 <b>
                                     <a>15</a>
@@ -18578,7 +18593,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>76577</v>
+                                    <v>76576</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18598,11 +18613,11 @@
         </relation>
         <relation>
             <name>autoderivation</name>
-            <cardinality>148035</cardinality>
+            <cardinality>147957</cardinality>
             <columnsizes>
                 <e>
                     <k>var</k>
-                    <v>148035</v>
+                    <v>147957</v>
                 </e>
                 <e>
                     <k>derivation_type</k>
@@ -18620,7 +18635,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>148035</v>
+                                    <v>147957</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18666,15 +18681,15 @@
         </relation>
         <relation>
             <name>orphaned_variables</name>
-            <cardinality>37368</cardinality>
+            <cardinality>37359</cardinality>
             <columnsizes>
                 <e>
                     <k>var</k>
-                    <v>37368</v>
+                    <v>37359</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>32845</v>
+                    <v>32837</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18688,7 +18703,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37368</v>
+                                    <v>37359</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18704,7 +18719,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30792</v>
+                                    <v>30785</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18719,11 +18734,11 @@
         </relation>
         <relation>
             <name>enumconstants</name>
-            <cardinality>241684</cardinality>
+            <cardinality>241682</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>241684</v>
+                    <v>241682</v>
                 </e>
                 <e>
                     <k>parent</k>
@@ -18739,11 +18754,11 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>241405</v>
+                    <v>241403</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>221587</v>
+                    <v>221585</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18757,7 +18772,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241684</v>
+                                    <v>241682</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18773,7 +18788,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241684</v>
+                                    <v>241682</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18789,7 +18804,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241684</v>
+                                    <v>241682</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18805,7 +18820,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241684</v>
+                                    <v>241682</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18821,7 +18836,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241684</v>
+                                    <v>241682</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19432,7 +19447,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241125</v>
+                                    <v>241123</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19453,7 +19468,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241125</v>
+                                    <v>241123</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19474,7 +19489,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241405</v>
+                                    <v>241403</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19490,7 +19505,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241405</v>
+                                    <v>241403</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19506,7 +19521,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241125</v>
+                                    <v>241123</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19527,7 +19542,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>220828</v>
+                                    <v>220826</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19548,7 +19563,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>221587</v>
+                                    <v>221585</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19564,7 +19579,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>220828</v>
+                                    <v>220826</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19585,7 +19600,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>221587</v>
+                                    <v>221585</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19601,7 +19616,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>220828</v>
+                                    <v>220826</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19616,23 +19631,23 @@
         </relation>
         <relation>
             <name>builtintypes</name>
-            <cardinality>26119</cardinality>
+            <cardinality>26120</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>26119</v>
+                    <v>26120</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>26119</v>
+                    <v>26120</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>26119</v>
+                    <v>26120</v>
                 </e>
                 <e>
                     <k>size</k>
-                    <v>3264</v>
+                    <v>3265</v>
                 </e>
                 <e>
                     <k>sign</k>
@@ -19654,7 +19669,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26119</v>
+                                    <v>26120</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19670,7 +19685,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26119</v>
+                                    <v>26120</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19686,7 +19701,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26119</v>
+                                    <v>26120</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19702,7 +19717,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26119</v>
+                                    <v>26120</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19718,7 +19733,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26119</v>
+                                    <v>26120</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19734,7 +19749,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26119</v>
+                                    <v>26120</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19750,7 +19765,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26119</v>
+                                    <v>26120</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19766,7 +19781,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26119</v>
+                                    <v>26120</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19782,7 +19797,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26119</v>
+                                    <v>26120</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19798,7 +19813,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26119</v>
+                                    <v>26120</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19814,7 +19829,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26119</v>
+                                    <v>26120</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19830,7 +19845,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26119</v>
+                                    <v>26120</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19846,7 +19861,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26119</v>
+                                    <v>26120</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19862,7 +19877,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26119</v>
+                                    <v>26120</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19878,7 +19893,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26119</v>
+                                    <v>26120</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20323,15 +20338,15 @@
         </relation>
         <relation>
             <name>derivedtypes</name>
-            <cardinality>4330701</cardinality>
+            <cardinality>4330887</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4330701</v>
+                    <v>4330887</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>2160919</v>
+                    <v>2161012</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -20339,7 +20354,7 @@
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>2670715</v>
+                    <v>2670830</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20353,7 +20368,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4330701</v>
+                                    <v>4330887</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20369,7 +20384,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4330701</v>
+                                    <v>4330887</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20385,7 +20400,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4330701</v>
+                                    <v>4330887</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20401,17 +20416,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1899258</v>
+                                    <v>1899340</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>164645</v>
+                                    <v>164653</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>1153</b>
-                                    <v>97015</v>
+                                    <v>97019</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20427,7 +20442,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2159986</v>
+                                    <v>2160079</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20448,17 +20463,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1899258</v>
+                                    <v>1899340</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>164645</v>
+                                    <v>164653</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>1135</b>
-                                    <v>97015</v>
+                                    <v>97019</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20597,22 +20612,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1651123</v>
+                                    <v>1651194</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>560169</v>
+                                    <v>560193</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>354012</v>
+                                    <v>354027</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>72</b>
-                                    <v>105410</v>
+                                    <v>105415</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20628,22 +20643,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1662317</v>
+                                    <v>1662389</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>552706</v>
+                                    <v>552730</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>351213</v>
+                                    <v>351228</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>72</b>
-                                    <v>104477</v>
+                                    <v>104482</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20659,22 +20674,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1655321</v>
+                                    <v>1655392</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>563900</v>
+                                    <v>563924</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>353079</v>
+                                    <v>353094</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>98414</v>
+                                    <v>98418</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20684,11 +20699,11 @@
         </relation>
         <relation>
             <name>pointerishsize</name>
-            <cardinality>3210362</cardinality>
+            <cardinality>3210500</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3210362</v>
+                    <v>3210500</v>
                 </e>
                 <e>
                     <k>size</k>
@@ -20710,7 +20725,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3210362</v>
+                                    <v>3210500</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20726,7 +20741,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3210362</v>
+                                    <v>3210500</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20800,19 +20815,19 @@
         </relation>
         <relation>
             <name>arraysizes</name>
-            <cardinality>88153</cardinality>
+            <cardinality>88157</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>88153</v>
+                    <v>88157</v>
                 </e>
                 <e>
                     <k>num_elements</k>
-                    <v>31716</v>
+                    <v>31717</v>
                 </e>
                 <e>
                     <k>bytesize</k>
-                    <v>33115</v>
+                    <v>33117</v>
                 </e>
                 <e>
                     <k>alignment</k>
@@ -20830,7 +20845,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>88153</v>
+                                    <v>88157</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20846,7 +20861,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>88153</v>
+                                    <v>88157</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20862,7 +20877,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>88153</v>
+                                    <v>88157</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20883,7 +20898,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>23787</v>
+                                    <v>23788</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -20914,7 +20929,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26585</v>
+                                    <v>26587</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20940,7 +20955,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26585</v>
+                                    <v>26587</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20971,12 +20986,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>23787</v>
+                                    <v>23788</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>3264</v>
+                                    <v>3265</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -21002,7 +21017,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27518</v>
+                                    <v>27519</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21028,7 +21043,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27518</v>
+                                    <v>27519</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21136,15 +21151,15 @@
         </relation>
         <relation>
             <name>typedefbase</name>
-            <cardinality>1672769</cardinality>
+            <cardinality>1672135</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1672769</v>
+                    <v>1672135</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>787413</v>
+                    <v>787114</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21158,7 +21173,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1672769</v>
+                                    <v>1672135</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21174,22 +21189,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>612790</v>
+                                    <v>612558</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>82588</v>
+                                    <v>82557</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>61505</v>
+                                    <v>61481</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>5437</b>
-                                    <v>30528</v>
+                                    <v>30517</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21199,19 +21214,19 @@
         </relation>
         <relation>
             <name>decltypes</name>
-            <cardinality>166216</cardinality>
+            <cardinality>165808</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>16699</v>
+                    <v>16658</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>166216</v>
+                    <v>165808</v>
                 </e>
                 <e>
                     <k>base_type</k>
-                    <v>9970</v>
+                    <v>9945</v>
                 </e>
                 <e>
                     <k>parentheses_would_change_meaning</k>
@@ -21229,37 +21244,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5090</v>
+                                    <v>5077</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6195</v>
+                                    <v>6180</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>1105</v>
+                                    <v>1102</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>12</b>
-                                    <v>1296</v>
+                                    <v>1293</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>18</b>
-                                    <v>1353</v>
+                                    <v>1350</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>46</b>
-                                    <v>1258</v>
+                                    <v>1255</v>
                                 </b>
                                 <b>
                                     <a>51</a>
                                     <b>740</b>
-                                    <v>400</v>
+                                    <v>399</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21275,7 +21290,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16699</v>
+                                    <v>16658</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21291,7 +21306,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16699</v>
+                                    <v>16658</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21307,7 +21322,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>166216</v>
+                                    <v>165808</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21323,7 +21338,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>166216</v>
+                                    <v>165808</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21339,7 +21354,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>166216</v>
+                                    <v>165808</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21355,17 +21370,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7244</v>
+                                    <v>7226</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2268</v>
+                                    <v>2263</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>149</b>
-                                    <v>457</v>
+                                    <v>456</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21381,32 +21396,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>724</v>
+                                    <v>722</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6138</v>
+                                    <v>6123</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>343</v>
+                                    <v>342</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>972</v>
+                                    <v>969</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>762</v>
+                                    <v>760</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>32</b>
-                                    <v>800</v>
+                                    <v>798</v>
                                 </b>
                                 <b>
                                     <a>32</a>
@@ -21427,7 +21442,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9970</v>
+                                    <v>9945</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21485,15 +21500,15 @@
         </relation>
         <relation>
             <name>usertypes</name>
-            <cardinality>5229957</cardinality>
+            <cardinality>5230182</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5229957</v>
+                    <v>5230182</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1351216</v>
+                    <v>1351274</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -21511,7 +21526,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5229957</v>
+                                    <v>5230182</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21527,7 +21542,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5229957</v>
+                                    <v>5230182</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21543,27 +21558,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>982745</v>
+                                    <v>982787</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>153451</v>
+                                    <v>153458</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>104477</v>
+                                    <v>104482</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>61</b>
-                                    <v>101679</v>
+                                    <v>101683</v>
                                 </b>
                                 <b>
                                     <a>65</a>
                                     <b>874</b>
-                                    <v>8861</v>
+                                    <v>8862</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21579,17 +21594,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1210823</v>
+                                    <v>1210876</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>125000</v>
+                                    <v>125005</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>15391</v>
+                                    <v>15392</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21731,11 +21746,11 @@
         </relation>
         <relation>
             <name>usertypesize</name>
-            <cardinality>1705694</cardinality>
+            <cardinality>1705768</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1705694</v>
+                    <v>1705768</v>
                 </e>
                 <e>
                     <k>size</k>
@@ -21757,7 +21772,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1705694</v>
+                                    <v>1705768</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21773,7 +21788,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1705694</v>
+                                    <v>1705768</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21789,7 +21804,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3264</v>
+                                    <v>3265</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21937,22 +21952,22 @@
         </relation>
         <relation>
             <name>usertype_final</name>
-            <cardinality>9420</cardinality>
+            <cardinality>9415</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9420</v>
+                    <v>9415</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>usertype_uuid</name>
-            <cardinality>36639</cardinality>
+            <cardinality>36638</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>36639</v>
+                    <v>36638</v>
                 </e>
                 <e>
                     <k>uuid</k>
@@ -21970,7 +21985,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36639</v>
+                                    <v>36638</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21986,7 +22001,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>35890</v>
+                                    <v>35889</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22001,15 +22016,15 @@
         </relation>
         <relation>
             <name>mangled_name</name>
-            <cardinality>9477636</cardinality>
+            <cardinality>9478043</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9477636</v>
+                    <v>9478043</v>
                 </e>
                 <e>
                     <k>mangled_name</k>
-                    <v>6448244</v>
+                    <v>6448521</v>
                 </e>
                 <e>
                     <k>is_complete</k>
@@ -22027,7 +22042,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9477636</v>
+                                    <v>9478043</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22043,7 +22058,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9477636</v>
+                                    <v>9478043</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22059,12 +22074,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6167459</v>
+                                    <v>6167725</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>874</b>
-                                    <v>280784</v>
+                                    <v>280796</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22080,7 +22095,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6448244</v>
+                                    <v>6448521</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22122,59 +22137,59 @@
         </relation>
         <relation>
             <name>is_pod_class</name>
-            <cardinality>530716</cardinality>
+            <cardinality>530515</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>530716</v>
+                    <v>530515</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_standard_layout_class</name>
-            <cardinality>1253734</cardinality>
+            <cardinality>1253788</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1253734</v>
+                    <v>1253788</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_complete</name>
-            <cardinality>1645060</cardinality>
+            <cardinality>1645130</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1645060</v>
+                    <v>1645130</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_class_template</name>
-            <cardinality>397855</cardinality>
+            <cardinality>397872</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>397855</v>
+                    <v>397872</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>class_instantiation</name>
-            <cardinality>1088622</cardinality>
+            <cardinality>1088668</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>1088622</v>
+                    <v>1088668</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>168377</v>
+                    <v>168384</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22188,7 +22203,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1088622</v>
+                                    <v>1088668</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22204,12 +22219,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>59701</v>
+                                    <v>59704</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>29384</v>
+                                    <v>29385</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -22219,12 +22234,12 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>13059</v>
+                                    <v>13060</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>9794</v>
+                                    <v>9795</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -22234,7 +22249,7 @@
                                 <b>
                                     <a>10</a>
                                     <b>16</b>
-                                    <v>13059</v>
+                                    <v>13060</v>
                                 </b>
                                 <b>
                                     <a>16</a>
@@ -22254,19 +22269,19 @@
         </relation>
         <relation>
             <name>class_template_argument</name>
-            <cardinality>2859038</cardinality>
+            <cardinality>2857953</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>1304835</v>
+                    <v>1304340</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>1253</v>
+                    <v>1252</v>
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>833229</v>
+                    <v>832912</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22280,27 +22295,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>536592</v>
+                                    <v>536388</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>396090</v>
+                                    <v>395940</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>229424</v>
+                                    <v>229337</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>119328</v>
+                                    <v>119283</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>113</b>
-                                    <v>23400</v>
+                                    <v>23391</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22316,22 +22331,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>563013</v>
+                                    <v>562800</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>407236</v>
+                                    <v>407082</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>242752</v>
+                                    <v>242660</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>113</b>
-                                    <v>91832</v>
+                                    <v>91797</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22439,27 +22454,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>518731</v>
+                                    <v>518534</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>172921</v>
+                                    <v>172856</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>50884</v>
+                                    <v>50865</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>10</b>
-                                    <v>63519</v>
+                                    <v>63495</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>10265</b>
-                                    <v>27171</v>
+                                    <v>27161</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22475,17 +22490,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>734424</v>
+                                    <v>734146</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>80630</v>
+                                    <v>80599</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>22</b>
-                                    <v>18174</v>
+                                    <v>18167</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22495,11 +22510,11 @@
         </relation>
         <relation>
             <name>class_template_argument_value</name>
-            <cardinality>494870</cardinality>
+            <cardinality>494891</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>304571</v>
+                    <v>304584</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -22507,7 +22522,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>494870</v>
+                    <v>494891</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22521,12 +22536,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>249534</v>
+                                    <v>249544</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>53171</v>
+                                    <v>53174</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -22547,22 +22562,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>189366</v>
+                                    <v>189374</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>81156</v>
+                                    <v>81160</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>12126</v>
+                                    <v>12127</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>21921</v>
+                                    <v>21922</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22640,7 +22655,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>494870</v>
+                                    <v>494891</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22656,7 +22671,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>494870</v>
+                                    <v>494891</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22666,15 +22681,15 @@
         </relation>
         <relation>
             <name>is_proxy_class_for</name>
-            <cardinality>62966</cardinality>
+            <cardinality>62969</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>62966</v>
+                    <v>62969</v>
                 </e>
                 <e>
                     <k>templ_param_id</k>
-                    <v>62966</v>
+                    <v>62969</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22688,7 +22703,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>62966</v>
+                                    <v>62969</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22704,7 +22719,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>62966</v>
+                                    <v>62969</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22714,19 +22729,19 @@
         </relation>
         <relation>
             <name>type_mentions</name>
-            <cardinality>4029370</cardinality>
+            <cardinality>4029338</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4029370</v>
+                    <v>4029338</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>198214</v>
+                    <v>198212</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>3995848</v>
+                    <v>3995817</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -22744,7 +22759,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4029370</v>
+                                    <v>4029338</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22760,7 +22775,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4029370</v>
+                                    <v>4029338</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22776,7 +22791,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4029370</v>
+                                    <v>4029338</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22894,7 +22909,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>198214</v>
+                                    <v>198212</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22910,7 +22925,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3962326</v>
+                                    <v>3962295</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22931,7 +22946,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3962326</v>
+                                    <v>3962295</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22952,7 +22967,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3995848</v>
+                                    <v>3995817</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23010,26 +23025,26 @@
         </relation>
         <relation>
             <name>is_function_template</name>
-            <cardinality>1401589</cardinality>
+            <cardinality>1401649</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1401589</v>
+                    <v>1401649</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_instantiation</name>
-            <cardinality>894870</cardinality>
+            <cardinality>894647</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>894870</v>
+                    <v>894647</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>144256</v>
+                    <v>144220</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23043,7 +23058,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>894870</v>
+                                    <v>894647</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23059,27 +23074,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>100033</v>
+                                    <v>100008</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>14230</v>
+                                    <v>14227</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>11864</v>
+                                    <v>11861</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>21</b>
-                                    <v>11899</v>
+                                    <v>11896</v>
                                 </b>
                                 <b>
                                     <a>22</a>
                                     <b>870</b>
-                                    <v>6228</v>
+                                    <v>6226</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23089,11 +23104,11 @@
         </relation>
         <relation>
             <name>function_template_argument</name>
-            <cardinality>2310645</cardinality>
+            <cardinality>2310067</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
-                    <v>1319951</v>
+                    <v>1319621</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -23101,7 +23116,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>300865</v>
+                    <v>300789</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23115,22 +23130,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>673580</v>
+                                    <v>673411</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>390007</v>
+                                    <v>389910</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>186566</v>
+                                    <v>186519</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>15</b>
-                                    <v>69797</v>
+                                    <v>69779</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23146,22 +23161,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>690977</v>
+                                    <v>690804</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>399784</v>
+                                    <v>399684</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>166664</v>
+                                    <v>166622</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>62525</v>
+                                    <v>62509</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23309,32 +23324,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>184304</v>
+                                    <v>184258</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>44049</v>
+                                    <v>44038</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>23172</v>
+                                    <v>23167</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>16</b>
-                                    <v>23207</v>
+                                    <v>23201</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>107</b>
-                                    <v>22720</v>
+                                    <v>22714</v>
                                 </b>
                                 <b>
                                     <a>108</a>
                                     <b>957</b>
-                                    <v>3409</v>
+                                    <v>3408</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23350,17 +23365,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>271116</v>
+                                    <v>271048</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>25678</v>
+                                    <v>25671</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>17</b>
-                                    <v>4070</v>
+                                    <v>4069</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23370,11 +23385,11 @@
         </relation>
         <relation>
             <name>function_template_argument_value</name>
-            <cardinality>358553</cardinality>
+            <cardinality>358464</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
-                    <v>192516</v>
+                    <v>192467</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -23382,7 +23397,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>355944</v>
+                    <v>355855</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23396,12 +23411,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>183260</v>
+                                    <v>183215</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>9255</v>
+                                    <v>9252</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23417,17 +23432,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>175919</v>
+                                    <v>175875</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>31</b>
-                                    <v>15100</v>
+                                    <v>15096</v>
                                 </b>
                                 <b>
                                     <a>32</a>
                                     <b>97</b>
-                                    <v>1496</v>
+                                    <v>1495</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23565,12 +23580,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>353334</v>
+                                    <v>353246</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2609</v>
+                                    <v>2608</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23586,7 +23601,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>355944</v>
+                                    <v>355855</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23596,26 +23611,26 @@
         </relation>
         <relation>
             <name>is_variable_template</name>
-            <cardinality>46998</cardinality>
+            <cardinality>46973</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>46998</v>
+                    <v>46973</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>variable_instantiation</name>
-            <cardinality>171327</cardinality>
+            <cardinality>171237</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>171327</v>
+                    <v>171237</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>25673</v>
+                    <v>25659</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23629,7 +23644,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>171327</v>
+                                    <v>171237</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23645,22 +23660,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13768</v>
+                                    <v>13761</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2588</v>
+                                    <v>2586</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1242</v>
+                                    <v>1241</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>1863</v>
+                                    <v>1862</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -23670,12 +23685,12 @@
                                 <b>
                                     <a>8</a>
                                     <b>12</b>
-                                    <v>2173</v>
+                                    <v>2172</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>38</b>
-                                    <v>1966</v>
+                                    <v>1965</v>
                                 </b>
                                 <b>
                                     <a>46</a>
@@ -23690,19 +23705,19 @@
         </relation>
         <relation>
             <name>variable_template_argument</name>
-            <cardinality>308493</cardinality>
+            <cardinality>308331</cardinality>
             <columnsizes>
                 <e>
                     <k>variable_id</k>
-                    <v>162217</v>
+                    <v>162132</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>1759</v>
+                    <v>1758</v>
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>170085</v>
+                    <v>169995</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23716,22 +23731,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>83023</v>
+                                    <v>82980</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>50518</v>
+                                    <v>50491</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>18633</v>
+                                    <v>18624</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>17</b>
-                                    <v>10041</v>
+                                    <v>10036</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23747,22 +23762,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>87682</v>
+                                    <v>87636</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>51760</v>
+                                    <v>51733</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>13561</v>
+                                    <v>13554</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>17</b>
-                                    <v>9213</v>
+                                    <v>9208</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23783,12 +23798,12 @@
                                 <b>
                                     <a>19</a>
                                     <b>20</b>
-                                    <v>621</v>
+                                    <v>620</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>27</b>
-                                    <v>414</v>
+                                    <v>413</v>
                                 </b>
                                 <b>
                                     <a>47</a>
@@ -23839,17 +23854,17 @@
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>414</v>
+                                    <v>413</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>12</b>
-                                    <v>207</v>
+                                    <v>206</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>13</b>
-                                    <v>414</v>
+                                    <v>413</v>
                                 </b>
                                 <b>
                                     <a>29</a>
@@ -23895,22 +23910,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>136855</v>
+                                    <v>136783</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>19358</v>
+                                    <v>19348</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>24</b>
-                                    <v>12836</v>
+                                    <v>12829</v>
                                 </b>
                                 <b>
                                     <a>24</a>
                                     <b>110</b>
-                                    <v>1035</v>
+                                    <v>1034</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23926,17 +23941,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>153211</v>
+                                    <v>153130</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>14803</v>
+                                    <v>14795</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>2070</v>
+                                    <v>2069</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23946,19 +23961,19 @@
         </relation>
         <relation>
             <name>variable_template_argument_value</name>
-            <cardinality>11801</cardinality>
+            <cardinality>11795</cardinality>
             <columnsizes>
                 <e>
                     <k>variable_id</k>
-                    <v>7764</v>
+                    <v>7760</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>414</v>
+                    <v>413</v>
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>11801</v>
+                    <v>11795</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23972,12 +23987,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7350</v>
+                                    <v>7346</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>414</v>
+                                    <v>413</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23993,12 +24008,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4347</v>
+                                    <v>4345</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3105</v>
+                                    <v>3104</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -24081,7 +24096,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11801</v>
+                                    <v>11795</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24097,7 +24112,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11801</v>
+                                    <v>11795</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24107,15 +24122,15 @@
         </relation>
         <relation>
             <name>routinetypes</name>
-            <cardinality>538161</cardinality>
+            <cardinality>538026</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>538161</v>
+                    <v>538026</v>
                 </e>
                 <e>
                     <k>return_type</k>
-                    <v>280406</v>
+                    <v>280336</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24129,7 +24144,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>538161</v>
+                                    <v>538026</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24145,17 +24160,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>244220</v>
+                                    <v>244159</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>20946</v>
+                                    <v>20940</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>3595</b>
-                                    <v>15239</v>
+                                    <v>15236</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24165,11 +24180,11 @@
         </relation>
         <relation>
             <name>routinetypeargs</name>
-            <cardinality>982278</cardinality>
+            <cardinality>982320</cardinality>
             <columnsizes>
                 <e>
                     <k>routine</k>
-                    <v>423042</v>
+                    <v>423060</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -24177,7 +24192,7 @@
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>226679</v>
+                    <v>226689</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24191,27 +24206,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>152519</v>
+                                    <v>152525</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>133862</v>
+                                    <v>133868</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>63432</v>
+                                    <v>63435</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>45709</v>
+                                    <v>45711</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>18</b>
-                                    <v>27518</v>
+                                    <v>27519</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24227,27 +24242,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>182369</v>
+                                    <v>182377</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>133395</v>
+                                    <v>133401</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>58768</v>
+                                    <v>58771</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>33582</v>
+                                    <v>33583</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>11</b>
-                                    <v>14925</v>
+                                    <v>14926</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24405,12 +24420,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>146455</v>
+                                    <v>146461</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>30783</v>
+                                    <v>30784</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -24420,12 +24435,12 @@
                                 <b>
                                     <a>5</a>
                                     <b>12</b>
-                                    <v>18190</v>
+                                    <v>18191</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>110</b>
-                                    <v>14458</v>
+                                    <v>14459</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24441,17 +24456,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172575</v>
+                                    <v>172582</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>30783</v>
+                                    <v>30784</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>18656</v>
+                                    <v>18657</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -24466,19 +24481,19 @@
         </relation>
         <relation>
             <name>ptrtomembers</name>
-            <cardinality>37779</cardinality>
+            <cardinality>37781</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>37779</v>
+                    <v>37781</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>37779</v>
+                    <v>37781</v>
                 </e>
                 <e>
                     <k>class_id</k>
-                    <v>15391</v>
+                    <v>15392</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24492,7 +24507,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37779</v>
+                                    <v>37781</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24508,7 +24523,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37779</v>
+                                    <v>37781</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24524,7 +24539,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37779</v>
+                                    <v>37781</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24540,7 +24555,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37779</v>
+                                    <v>37781</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24602,15 +24617,15 @@
         </relation>
         <relation>
             <name>specifiers</name>
-            <cardinality>24720</cardinality>
+            <cardinality>24721</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>24720</v>
+                    <v>24721</v>
                 </e>
                 <e>
                     <k>str</k>
-                    <v>24720</v>
+                    <v>24721</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24624,7 +24639,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>24720</v>
+                                    <v>24721</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24640,7 +24655,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>24720</v>
+                                    <v>24721</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24650,11 +24665,11 @@
         </relation>
         <relation>
             <name>typespecifiers</name>
-            <cardinality>1291048</cardinality>
+            <cardinality>1291103</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>1272857</v>
+                    <v>1272912</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -24672,12 +24687,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1254667</v>
+                                    <v>1254721</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>18190</v>
+                                    <v>18191</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24738,11 +24753,11 @@
         </relation>
         <relation>
             <name>funspecifiers</name>
-            <cardinality>12607036</cardinality>
+            <cardinality>12603886</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>3854601</v>
+                    <v>3853638</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -24760,27 +24775,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>310746</v>
+                                    <v>310668</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>540214</v>
+                                    <v>540079</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1133732</v>
+                                    <v>1133449</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1624017</v>
+                                    <v>1623611</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>245890</v>
+                                    <v>245828</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24896,11 +24911,11 @@
         </relation>
         <relation>
             <name>varspecifiers</name>
-            <cardinality>2243942</cardinality>
+            <cardinality>2244038</cardinality>
             <columnsizes>
                 <e>
                     <k>var_id</k>
-                    <v>1223883</v>
+                    <v>1223936</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -24918,22 +24933,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>729479</v>
+                                    <v>729510</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>202425</v>
+                                    <v>202434</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>58302</v>
+                                    <v>58304</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>233675</v>
+                                    <v>233686</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24994,11 +25009,11 @@
         </relation>
         <relation>
             <name>attributes</name>
-            <cardinality>729824</cardinality>
+            <cardinality>729440</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>729824</v>
+                    <v>729440</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -25006,15 +25021,15 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1656</v>
+                    <v>1655</v>
                 </e>
                 <e>
                     <k>name_space</k>
-                    <v>207</v>
+                    <v>206</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>479613</v>
+                    <v>479361</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25028,7 +25043,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>729824</v>
+                                    <v>729440</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25044,7 +25059,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>729824</v>
+                                    <v>729440</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25060,7 +25075,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>729824</v>
+                                    <v>729440</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25076,7 +25091,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>729824</v>
+                                    <v>729440</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25144,7 +25159,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>207</v>
+                                    <v>206</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25272,12 +25287,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1449</v>
+                                    <v>1448</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>207</v>
+                                    <v>206</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25293,7 +25308,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1656</v>
+                                    <v>1655</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25314,7 +25329,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>207</v>
+                                    <v>206</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -25469,17 +25484,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>422573</v>
+                                    <v>422351</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>36335</v>
+                                    <v>36316</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>201</b>
-                                    <v>20704</v>
+                                    <v>20693</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25495,7 +25510,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>479613</v>
+                                    <v>479361</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25511,12 +25526,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>475369</v>
+                                    <v>475119</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4244</v>
+                                    <v>4242</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25532,7 +25547,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>479613</v>
+                                    <v>479361</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25542,11 +25557,11 @@
         </relation>
         <relation>
             <name>attribute_args</name>
-            <cardinality>409982</cardinality>
+            <cardinality>410000</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>409982</v>
+                    <v>410000</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -25554,7 +25569,7 @@
                 </e>
                 <e>
                     <k>attribute</k>
-                    <v>298041</v>
+                    <v>298054</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -25562,7 +25577,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>327426</v>
+                    <v>327440</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25576,7 +25591,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>409982</v>
+                                    <v>410000</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25592,7 +25607,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>409982</v>
+                                    <v>410000</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25608,7 +25623,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>409982</v>
+                                    <v>410000</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25624,7 +25639,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>409982</v>
+                                    <v>410000</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25739,17 +25754,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>215952</v>
+                                    <v>215961</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>52238</v>
+                                    <v>52241</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>29850</v>
+                                    <v>29852</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25765,12 +25780,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>273788</v>
+                                    <v>273799</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>24253</v>
+                                    <v>24254</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25786,17 +25801,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>215952</v>
+                                    <v>215961</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>52238</v>
+                                    <v>52241</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>29850</v>
+                                    <v>29852</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25812,17 +25827,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>215952</v>
+                                    <v>215961</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>52238</v>
+                                    <v>52241</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>29850</v>
+                                    <v>29852</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25937,17 +25952,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>278918</v>
+                                    <v>278930</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>23320</v>
+                                    <v>23321</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>24720</v>
+                                    <v>24721</v>
                                 </b>
                                 <b>
                                     <a>17</a>
@@ -25968,7 +25983,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>314832</v>
+                                    <v>314846</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25989,17 +26004,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>278918</v>
+                                    <v>278930</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>23320</v>
+                                    <v>23321</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>24720</v>
+                                    <v>24721</v>
                                 </b>
                                 <b>
                                     <a>17</a>
@@ -26020,7 +26035,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>327426</v>
+                                    <v>327440</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26030,11 +26045,11 @@
         </relation>
         <relation>
             <name>attribute_arg_value</name>
-            <cardinality>39179</cardinality>
+            <cardinality>39180</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>39179</v>
+                    <v>39180</v>
                 </e>
                 <e>
                     <k>value</k>
@@ -26052,7 +26067,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39179</v>
+                                    <v>39180</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26068,7 +26083,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14458</v>
+                                    <v>14459</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26131,15 +26146,15 @@
         </relation>
         <relation>
             <name>attribute_arg_constant</name>
-            <cardinality>370336</cardinality>
+            <cardinality>370352</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>370336</v>
+                    <v>370352</v>
                 </e>
                 <e>
                     <k>constant</k>
-                    <v>370336</v>
+                    <v>370352</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26153,7 +26168,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>370336</v>
+                                    <v>370352</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26169,7 +26184,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>370336</v>
+                                    <v>370352</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26280,15 +26295,15 @@
         </relation>
         <relation>
             <name>typeattributes</name>
-            <cardinality>84369</cardinality>
+            <cardinality>84325</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>61698</v>
+                    <v>61666</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>84369</v>
+                    <v>84325</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26302,17 +26317,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>55797</v>
+                                    <v>55768</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>4244</v>
+                                    <v>4242</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>13</b>
-                                    <v>1656</v>
+                                    <v>1655</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26328,7 +26343,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>84369</v>
+                                    <v>84325</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26338,15 +26353,15 @@
         </relation>
         <relation>
             <name>funcattributes</name>
-            <cardinality>651587</cardinality>
+            <cardinality>651615</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>443098</v>
+                    <v>443117</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>651587</v>
+                    <v>651615</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26360,17 +26375,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>334422</v>
+                                    <v>334436</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>65298</v>
+                                    <v>65301</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>34981</v>
+                                    <v>34982</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -26391,7 +26406,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>651587</v>
+                                    <v>651615</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26507,15 +26522,15 @@
         </relation>
         <relation>
             <name>unspecifiedtype</name>
-            <cardinality>10144615</cardinality>
+            <cardinality>10145051</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>10144615</v>
+                    <v>10145051</v>
                 </e>
                 <e>
                     <k>unspecified_type_id</k>
-                    <v>6817181</v>
+                    <v>6817474</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26529,7 +26544,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10144615</v>
+                                    <v>10145051</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26545,17 +26560,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4584433</v>
+                                    <v>4584630</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1995340</v>
+                                    <v>1995426</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>145</b>
-                                    <v>237407</v>
+                                    <v>237417</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26565,19 +26580,19 @@
         </relation>
         <relation>
             <name>member</name>
-            <cardinality>4945084</cardinality>
+            <cardinality>4943849</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>639377</v>
+                    <v>639217</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>8698</v>
+                    <v>8696</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>4900409</v>
+                    <v>4899184</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26591,42 +26606,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>3</b>
-                                    <v>19067</v>
+                                    <v>19062</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>344496</v>
+                                    <v>344410</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>37786</v>
+                                    <v>37777</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>52504</v>
+                                    <v>52491</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>10</b>
-                                    <v>52191</v>
+                                    <v>52178</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>15</b>
-                                    <v>49581</v>
+                                    <v>49569</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>24</b>
-                                    <v>48955</v>
+                                    <v>48943</v>
                                 </b>
                                 <b>
                                     <a>24</a>
                                     <b>251</b>
-                                    <v>34794</v>
+                                    <v>34785</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26642,42 +26657,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>3</b>
-                                    <v>19067</v>
+                                    <v>19062</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>344427</v>
+                                    <v>344341</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>37821</v>
+                                    <v>37811</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>52608</v>
+                                    <v>52595</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>10</b>
-                                    <v>52539</v>
+                                    <v>52526</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>15</b>
-                                    <v>49198</v>
+                                    <v>49186</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>24</b>
-                                    <v>49024</v>
+                                    <v>49012</v>
                                 </b>
                                 <b>
                                     <a>24</a>
                                     <b>255</b>
-                                    <v>34689</v>
+                                    <v>34681</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26708,42 +26723,42 @@
                                 <b>
                                     <a>5</a>
                                     <b>22</b>
-                                    <v>661</v>
+                                    <v>660</v>
                                 </b>
                                 <b>
                                     <a>22</a>
                                     <b>42</b>
-                                    <v>661</v>
+                                    <v>660</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>56</b>
-                                    <v>661</v>
+                                    <v>660</v>
                                 </b>
                                 <b>
                                     <a>56</a>
                                     <b>100</b>
-                                    <v>661</v>
+                                    <v>660</v>
                                 </b>
                                 <b>
                                     <a>104</a>
                                     <b>164</b>
-                                    <v>661</v>
+                                    <v>660</v>
                                 </b>
                                 <b>
                                     <a>181</a>
                                     <b>299</b>
-                                    <v>661</v>
+                                    <v>660</v>
                                 </b>
                                 <b>
                                     <a>300</a>
                                     <b>727</b>
-                                    <v>661</v>
+                                    <v>660</v>
                                 </b>
                                 <b>
                                     <a>845</a>
                                     <b>4002</b>
-                                    <v>661</v>
+                                    <v>660</v>
                                 </b>
                                 <b>
                                     <a>4606</a>
@@ -26774,12 +26789,12 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1148</v>
+                                    <v>1147</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>15</b>
-                                    <v>661</v>
+                                    <v>660</v>
                                 </b>
                                 <b>
                                     <a>16</a>
@@ -26789,7 +26804,7 @@
                                 <b>
                                     <a>36</a>
                                     <b>55</b>
-                                    <v>661</v>
+                                    <v>660</v>
                                 </b>
                                 <b>
                                     <a>57</a>
@@ -26799,22 +26814,22 @@
                                 <b>
                                     <a>97</a>
                                     <b>135</b>
-                                    <v>661</v>
+                                    <v>660</v>
                                 </b>
                                 <b>
                                     <a>140</a>
                                     <b>256</b>
-                                    <v>661</v>
+                                    <v>660</v>
                                 </b>
                                 <b>
                                     <a>268</a>
                                     <b>612</b>
-                                    <v>661</v>
+                                    <v>660</v>
                                 </b>
                                 <b>
                                     <a>619</a>
                                     <b>2611</b>
-                                    <v>661</v>
+                                    <v>660</v>
                                 </b>
                                 <b>
                                     <a>2770</a>
@@ -26835,7 +26850,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4900409</v>
+                                    <v>4899184</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26851,12 +26866,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4857090</v>
+                                    <v>4855876</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>43318</v>
+                                    <v>43307</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26866,15 +26881,15 @@
         </relation>
         <relation>
             <name>enclosingfunction</name>
-            <cardinality>117884</cardinality>
+            <cardinality>117840</cardinality>
             <columnsizes>
                 <e>
                     <k>child</k>
-                    <v>117884</v>
+                    <v>117840</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>67335</v>
+                    <v>67310</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26888,7 +26903,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>117884</v>
+                                    <v>117840</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26904,22 +26919,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>35587</v>
+                                    <v>35573</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>20893</v>
+                                    <v>20885</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5908</v>
+                                    <v>5906</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>45</b>
-                                    <v>4946</v>
+                                    <v>4944</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26929,15 +26944,15 @@
         </relation>
         <relation>
             <name>derivations</name>
-            <cardinality>391086</cardinality>
+            <cardinality>390988</cardinality>
             <columnsizes>
                 <e>
                     <k>derivation</k>
-                    <v>391086</v>
+                    <v>390988</v>
                 </e>
                 <e>
                     <k>sub</k>
-                    <v>370836</v>
+                    <v>370743</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -26945,11 +26960,11 @@
                 </e>
                 <e>
                     <k>super</k>
-                    <v>202501</v>
+                    <v>202451</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>37682</v>
+                    <v>37672</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26963,7 +26978,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>391086</v>
+                                    <v>390988</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26979,7 +26994,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>391086</v>
+                                    <v>390988</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26995,7 +27010,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>391086</v>
+                                    <v>390988</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27011,7 +27026,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>391086</v>
+                                    <v>390988</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27027,12 +27042,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>355874</v>
+                                    <v>355785</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>14961</v>
+                                    <v>14957</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27048,12 +27063,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>355874</v>
+                                    <v>355785</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>14961</v>
+                                    <v>14957</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27069,12 +27084,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>355874</v>
+                                    <v>355785</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>14961</v>
+                                    <v>14957</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27090,12 +27105,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>355874</v>
+                                    <v>355785</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>14961</v>
+                                    <v>14957</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27240,12 +27255,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>195125</v>
+                                    <v>195076</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1519</b>
-                                    <v>7376</v>
+                                    <v>7374</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27261,12 +27276,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>195125</v>
+                                    <v>195076</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1519</b>
-                                    <v>7376</v>
+                                    <v>7374</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27282,7 +27297,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>202049</v>
+                                    <v>201999</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27303,12 +27318,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>198848</v>
+                                    <v>198798</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>108</b>
-                                    <v>3653</v>
+                                    <v>3652</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27324,12 +27339,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28009</v>
+                                    <v>28002</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>3201</v>
+                                    <v>3200</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -27339,7 +27354,7 @@
                                 <b>
                                     <a>15</a>
                                     <b>134</b>
-                                    <v>2853</v>
+                                    <v>2852</v>
                                 </b>
                                 <b>
                                     <a>136</a>
@@ -27360,12 +27375,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28009</v>
+                                    <v>28002</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>3201</v>
+                                    <v>3200</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -27375,7 +27390,7 @@
                                 <b>
                                     <a>15</a>
                                     <b>134</b>
-                                    <v>2853</v>
+                                    <v>2852</v>
                                 </b>
                                 <b>
                                     <a>136</a>
@@ -27396,7 +27411,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37682</v>
+                                    <v>37672</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27412,17 +27427,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30375</v>
+                                    <v>30367</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>3340</v>
+                                    <v>3339</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>45</b>
-                                    <v>2853</v>
+                                    <v>2852</v>
                                 </b>
                                 <b>
                                     <a>54</a>
@@ -27437,11 +27452,11 @@
         </relation>
         <relation>
             <name>derspecifiers</name>
-            <cardinality>392965</cardinality>
+            <cardinality>392867</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>390703</v>
+                    <v>390605</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -27459,7 +27474,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>388441</v>
+                                    <v>388344</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27505,11 +27520,11 @@
         </relation>
         <relation>
             <name>direct_base_offsets</name>
-            <cardinality>362172</cardinality>
+            <cardinality>362081</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>362172</v>
+                    <v>362081</v>
                 </e>
                 <e>
                     <k>offset</k>
@@ -27527,7 +27542,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>362172</v>
+                                    <v>362081</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27578,11 +27593,11 @@
         </relation>
         <relation>
             <name>virtual_base_offsets</name>
-            <cardinality>6445</cardinality>
+            <cardinality>6443</cardinality>
             <columnsizes>
                 <e>
                     <k>sub</k>
-                    <v>3558</v>
+                    <v>3557</v>
                 </e>
                 <e>
                     <k>super</k>
@@ -27604,7 +27619,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2797</v>
+                                    <v>2796</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27635,7 +27650,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2999</v>
+                                    <v>2998</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27869,23 +27884,23 @@
         </relation>
         <relation>
             <name>frienddecls</name>
-            <cardinality>706182</cardinality>
+            <cardinality>706005</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>706182</v>
+                    <v>706005</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>41857</v>
+                    <v>41846</v>
                 </e>
                 <e>
                     <k>decl_id</k>
-                    <v>69309</v>
+                    <v>69292</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>6262</v>
+                    <v>6261</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27899,7 +27914,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>706182</v>
+                                    <v>706005</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27915,7 +27930,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>706182</v>
+                                    <v>706005</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27931,7 +27946,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>706182</v>
+                                    <v>706005</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27947,22 +27962,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6123</v>
+                                    <v>6122</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>13047</v>
+                                    <v>13044</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>2922</v>
+                                    <v>2921</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>3166</v>
+                                    <v>3165</v>
                                 </b>
                                 <b>
                                     <a>10</a>
@@ -27972,22 +27987,22 @@
                                 <b>
                                     <a>17</a>
                                     <b>24</b>
-                                    <v>3305</v>
+                                    <v>3304</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>36</b>
-                                    <v>3270</v>
+                                    <v>3269</v>
                                 </b>
                                 <b>
                                     <a>37</a>
                                     <b>55</b>
-                                    <v>3201</v>
+                                    <v>3200</v>
                                 </b>
                                 <b>
                                     <a>55</a>
                                     <b>103</b>
-                                    <v>3583</v>
+                                    <v>3582</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28003,22 +28018,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6123</v>
+                                    <v>6122</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>13047</v>
+                                    <v>13044</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>2922</v>
+                                    <v>2921</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>3166</v>
+                                    <v>3165</v>
                                 </b>
                                 <b>
                                     <a>10</a>
@@ -28028,22 +28043,22 @@
                                 <b>
                                     <a>17</a>
                                     <b>24</b>
-                                    <v>3305</v>
+                                    <v>3304</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>36</b>
-                                    <v>3270</v>
+                                    <v>3269</v>
                                 </b>
                                 <b>
                                     <a>37</a>
                                     <b>55</b>
-                                    <v>3201</v>
+                                    <v>3200</v>
                                 </b>
                                 <b>
                                     <a>55</a>
                                     <b>103</b>
-                                    <v>3583</v>
+                                    <v>3582</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28059,7 +28074,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40430</v>
+                                    <v>40420</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28080,32 +28095,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39978</v>
+                                    <v>39968</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5810</v>
+                                    <v>5809</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>5949</v>
+                                    <v>5948</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>15</b>
-                                    <v>5358</v>
+                                    <v>5356</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>32</b>
-                                    <v>5219</v>
+                                    <v>5217</v>
                                 </b>
                                 <b>
                                     <a>32</a>
                                     <b>71</b>
-                                    <v>5219</v>
+                                    <v>5217</v>
                                 </b>
                                 <b>
                                     <a>72</a>
@@ -28126,32 +28141,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39978</v>
+                                    <v>39968</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5810</v>
+                                    <v>5809</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>5949</v>
+                                    <v>5948</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>15</b>
-                                    <v>5358</v>
+                                    <v>5356</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>32</b>
-                                    <v>5219</v>
+                                    <v>5217</v>
                                 </b>
                                 <b>
                                     <a>32</a>
                                     <b>71</b>
-                                    <v>5219</v>
+                                    <v>5217</v>
                                 </b>
                                 <b>
                                     <a>72</a>
@@ -28172,12 +28187,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>68648</v>
+                                    <v>68631</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>661</v>
+                                    <v>660</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28193,7 +28208,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5880</v>
+                                    <v>5878</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28214,7 +28229,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6123</v>
+                                    <v>6122</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28235,7 +28250,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5915</v>
+                                    <v>5913</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28250,19 +28265,19 @@
         </relation>
         <relation>
             <name>comments</name>
-            <cardinality>8686670</cardinality>
+            <cardinality>8682106</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>8686670</v>
+                    <v>8682106</v>
                 </e>
                 <e>
                     <k>contents</k>
-                    <v>3307709</v>
+                    <v>3305971</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>8686670</v>
+                    <v>8682106</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28276,7 +28291,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8686670</v>
+                                    <v>8682106</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28292,7 +28307,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8686670</v>
+                                    <v>8682106</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28308,17 +28323,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3025820</v>
+                                    <v>3024231</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>248657</v>
+                                    <v>248527</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>32784</b>
-                                    <v>33230</v>
+                                    <v>33212</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28334,17 +28349,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3025820</v>
+                                    <v>3024231</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>248657</v>
+                                    <v>248527</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>32784</b>
-                                    <v>33230</v>
+                                    <v>33212</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28360,7 +28375,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8686670</v>
+                                    <v>8682106</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28376,7 +28391,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8686670</v>
+                                    <v>8682106</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28386,15 +28401,15 @@
         </relation>
         <relation>
             <name>commentbinding</name>
-            <cardinality>3088160</cardinality>
+            <cardinality>3088293</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2443103</v>
+                    <v>2443208</v>
                 </e>
                 <e>
                     <k>element</k>
-                    <v>3011668</v>
+                    <v>3011797</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28408,12 +28423,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2366144</v>
+                                    <v>2366245</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>97</b>
-                                    <v>76959</v>
+                                    <v>76962</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28429,12 +28444,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2935175</v>
+                                    <v>2935301</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>76492</v>
+                                    <v>76496</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28444,15 +28459,15 @@
         </relation>
         <relation>
             <name>exprconv</name>
-            <cardinality>7033432</cardinality>
+            <cardinality>7033379</cardinality>
             <columnsizes>
                 <e>
                     <k>converted</k>
-                    <v>7033432</v>
+                    <v>7033379</v>
                 </e>
                 <e>
                     <k>conversion</k>
-                    <v>7033432</v>
+                    <v>7033379</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28466,7 +28481,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7033432</v>
+                                    <v>7033379</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28482,7 +28497,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7033432</v>
+                                    <v>7033379</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28492,30 +28507,30 @@
         </relation>
         <relation>
             <name>compgenerated</name>
-            <cardinality>9265823</cardinality>
+            <cardinality>9267960</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9265823</v>
+                    <v>9267960</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>synthetic_destructor_call</name>
-            <cardinality>471159</cardinality>
+            <cardinality>473158</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
-                    <v>286813</v>
+                    <v>286203</v>
                 </e>
                 <e>
                     <k>i</k>
-                    <v>381</v>
+                    <v>380</v>
                 </e>
                 <e>
                     <k>destructor_call</k>
-                    <v>471159</v>
+                    <v>473158</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28529,27 +28544,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>190103</v>
+                                    <v>188057</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>50404</v>
+                                    <v>50984</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>21503</v>
+                                    <v>21850</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>7</b>
-                                    <v>23238</v>
+                                    <b>6</b>
+                                    <v>21584</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
+                                    <a>6</a>
                                     <b>20</b>
-                                    <v>1563</v>
+                                    <v>3727</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28565,27 +28580,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>189912</v>
+                                    <v>188057</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>50537</v>
+                                    <v>50984</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>21503</v>
+                                    <v>21850</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>7</b>
-                                    <v>23295</v>
+                                    <b>6</b>
+                                    <v>21584</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
+                                    <a>6</a>
                                     <b>20</b>
-                                    <v>1563</v>
+                                    <v>3727</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28644,18 +28659,18 @@
                                     <v>19</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>19</b>
+                                    <a>19</a>
+                                    <b>20</b>
                                     <v>19</v>
                                 </b>
                                 <b>
-                                    <a>26</a>
-                                    <b>27</b>
+                                    <a>27</a>
+                                    <b>28</b>
                                     <v>19</v>
                                 </b>
                                 <b>
-                                    <a>34</a>
-                                    <b>35</b>
+                                    <a>35</a>
+                                    <b>36</b>
                                     <v>19</v>
                                 </b>
                                 <b>
@@ -28664,38 +28679,38 @@
                                     <v>19</v>
                                 </b>
                                 <b>
-                                    <a>82</a>
-                                    <b>83</b>
+                                    <a>83</a>
+                                    <b>84</b>
                                     <v>19</v>
                                 </b>
                                 <b>
-                                    <a>193</a>
-                                    <b>194</b>
+                                    <a>196</a>
+                                    <b>197</b>
                                     <v>19</v>
                                 </b>
                                 <b>
-                                    <a>422</a>
-                                    <b>423</b>
+                                    <a>435</a>
+                                    <b>436</b>
                                     <v>19</v>
                                 </b>
                                 <b>
-                                    <a>1301</a>
-                                    <b>1302</b>
+                                    <a>1331</a>
+                                    <b>1332</b>
                                     <v>19</v>
                                 </b>
                                 <b>
-                                    <a>2429</a>
-                                    <b>2430</b>
+                                    <a>2480</a>
+                                    <b>2481</b>
                                     <v>19</v>
                                 </b>
                                 <b>
-                                    <a>5068</a>
-                                    <b>5069</b>
+                                    <a>5156</a>
+                                    <b>5157</b>
                                     <v>19</v>
                                 </b>
                                 <b>
-                                    <a>15013</a>
-                                    <b>15014</b>
+                                    <a>15018</a>
+                                    <b>15019</b>
                                     <v>19</v>
                                 </b>
                             </bs>
@@ -28755,18 +28770,18 @@
                                     <v>19</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>19</b>
+                                    <a>19</a>
+                                    <b>20</b>
                                     <v>19</v>
                                 </b>
                                 <b>
-                                    <a>26</a>
-                                    <b>27</b>
+                                    <a>27</a>
+                                    <b>28</b>
                                     <v>19</v>
                                 </b>
                                 <b>
-                                    <a>34</a>
-                                    <b>35</b>
+                                    <a>35</a>
+                                    <b>36</b>
                                     <v>19</v>
                                 </b>
                                 <b>
@@ -28775,38 +28790,38 @@
                                     <v>19</v>
                                 </b>
                                 <b>
-                                    <a>82</a>
-                                    <b>83</b>
+                                    <a>83</a>
+                                    <b>84</b>
                                     <v>19</v>
                                 </b>
                                 <b>
-                                    <a>193</a>
-                                    <b>194</b>
+                                    <a>196</a>
+                                    <b>197</b>
                                     <v>19</v>
                                 </b>
                                 <b>
-                                    <a>422</a>
-                                    <b>423</b>
+                                    <a>435</a>
+                                    <b>436</b>
                                     <v>19</v>
                                 </b>
                                 <b>
-                                    <a>1301</a>
-                                    <b>1302</b>
+                                    <a>1331</a>
+                                    <b>1332</b>
                                     <v>19</v>
                                 </b>
                                 <b>
-                                    <a>2429</a>
-                                    <b>2430</b>
+                                    <a>2480</a>
+                                    <b>2481</b>
                                     <v>19</v>
                                 </b>
                                 <b>
-                                    <a>5071</a>
-                                    <b>5072</b>
+                                    <a>5156</a>
+                                    <b>5157</b>
                                     <v>19</v>
                                 </b>
                                 <b>
-                                    <a>15038</a>
-                                    <b>15039</b>
+                                    <a>15018</a>
+                                    <b>15019</b>
                                     <v>19</v>
                                 </b>
                             </bs>
@@ -28823,7 +28838,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>471159</v>
+                                    <v>473158</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28839,7 +28854,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>471159</v>
+                                    <v>473158</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28849,15 +28864,15 @@
         </relation>
         <relation>
             <name>namespaces</name>
-            <cardinality>12126</cardinality>
+            <cardinality>12127</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12126</v>
+                    <v>12127</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>9794</v>
+                    <v>9795</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28871,7 +28886,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12126</v>
+                                    <v>12127</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28918,7 +28933,7 @@
         </relation>
         <relation>
             <name>namespacembrs</name>
-            <cardinality>2385733</cardinality>
+            <cardinality>2385836</cardinality>
             <columnsizes>
                 <e>
                     <k>parentid</k>
@@ -28926,7 +28941,7 @@
                 </e>
                 <e>
                     <k>memberid</k>
-                    <v>2385733</v>
+                    <v>2385836</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29001,7 +29016,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2385733</v>
+                                    <v>2385836</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29011,11 +29026,11 @@
         </relation>
         <relation>
             <name>exprparents</name>
-            <cardinality>14207341</cardinality>
+            <cardinality>14207231</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>14207341</v>
+                    <v>14207231</v>
                 </e>
                 <e>
                     <k>child_index</k>
@@ -29023,7 +29038,7 @@
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>9454239</v>
+                    <v>9454166</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29037,7 +29052,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14207341</v>
+                                    <v>14207231</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29053,7 +29068,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14207341</v>
+                                    <v>14207231</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29171,17 +29186,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5409675</v>
+                                    <v>5409633</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3706806</v>
+                                    <v>3706777</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>712</b>
-                                    <v>337757</v>
+                                    <v>337754</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29197,17 +29212,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5409675</v>
+                                    <v>5409633</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3706806</v>
+                                    <v>3706777</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>712</b>
-                                    <v>337757</v>
+                                    <v>337754</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29217,11 +29232,11 @@
         </relation>
         <relation>
             <name>expr_isload</name>
-            <cardinality>5170780</cardinality>
+            <cardinality>5168684</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>5170780</v>
+                    <v>5168684</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -29301,11 +29316,11 @@
         </relation>
         <relation>
             <name>iscall</name>
-            <cardinality>3183297</cardinality>
+            <cardinality>3182186</cardinality>
             <columnsizes>
                 <e>
                     <k>caller</k>
-                    <v>3183297</v>
+                    <v>3182186</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -29323,7 +29338,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3183297</v>
+                                    <v>3182186</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29337,18 +29352,18 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1318</a>
-                                    <b>1319</b>
+                                    <a>1319</a>
+                                    <b>1320</b>
                                     <v>19</v>
                                 </b>
                                 <b>
-                                    <a>2471</a>
-                                    <b>2472</b>
+                                    <a>2473</a>
+                                    <b>2474</b>
                                     <v>19</v>
                                 </b>
                                 <b>
-                                    <a>163193</a>
-                                    <b>163194</b>
+                                    <a>163543</a>
+                                    <b>163544</b>
                                     <v>19</v>
                                 </b>
                             </bs>
@@ -29359,11 +29374,11 @@
         </relation>
         <relation>
             <name>numtemplatearguments</name>
-            <cardinality>393347</cardinality>
+            <cardinality>393249</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>393347</v>
+                    <v>393249</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -29381,7 +29396,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>393347</v>
+                                    <v>393249</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29485,23 +29500,23 @@
         </relation>
         <relation>
             <name>namequalifiers</name>
-            <cardinality>1516804</cardinality>
+            <cardinality>1515301</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1516804</v>
+                    <v>1515301</v>
                 </e>
                 <e>
                     <k>qualifiableelement</k>
-                    <v>1516804</v>
+                    <v>1515301</v>
                 </e>
                 <e>
                     <k>qualifyingelement</k>
-                    <v>97777</v>
+                    <v>97613</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>305343</v>
+                    <v>304593</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29515,7 +29530,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1516804</v>
+                                    <v>1515301</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29531,7 +29546,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1516804</v>
+                                    <v>1515301</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29547,7 +29562,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1516804</v>
+                                    <v>1515301</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29563,7 +29578,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1516804</v>
+                                    <v>1515301</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29579,7 +29594,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1516804</v>
+                                    <v>1515301</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29595,7 +29610,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1516804</v>
+                                    <v>1515301</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29611,27 +29626,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>58601</v>
+                                    <v>58457</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>22457</v>
+                                    <v>22420</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>8921</v>
+                                    <v>8918</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>92</b>
-                                    <v>7377</v>
+                                    <v>7378</v>
                                 </b>
                                 <b>
                                     <a>96</a>
-                                    <b>21572</b>
-                                    <v>419</v>
+                                    <b>21584</b>
+                                    <v>437</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29647,27 +29662,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>58601</v>
+                                    <v>58457</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>22457</v>
+                                    <v>22420</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>8921</v>
+                                    <v>8918</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>92</b>
-                                    <v>7377</v>
+                                    <v>7378</v>
                                 </b>
                                 <b>
                                     <a>96</a>
-                                    <b>21572</b>
-                                    <v>419</v>
+                                    <b>21584</b>
+                                    <v>437</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29683,22 +29698,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>64035</v>
+                                    <v>63877</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>20703</v>
+                                    <v>20671</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>8388</v>
+                                    <v>8386</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7095</b>
-                                    <v>4651</v>
+                                    <v>4678</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29714,32 +29729,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>101018</v>
+                                    <v>100656</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>28385</v>
+                                    <v>28430</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>44780</v>
+                                    <v>44651</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>14316</v>
+                                    <v>13768</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>95394</v>
+                                    <v>95692</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>790</b>
-                                    <v>21446</v>
+                                    <v>21393</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29755,32 +29770,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>101018</v>
+                                    <v>100656</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>28385</v>
+                                    <v>28430</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>44780</v>
+                                    <v>44651</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>14316</v>
+                                    <v>13768</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>95394</v>
+                                    <v>95692</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>790</b>
-                                    <v>21446</v>
+                                    <v>21393</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29796,22 +29811,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>137659</v>
+                                    <v>137206</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>55799</v>
+                                    <v>55738</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>102658</v>
+                                    <v>102443</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>143</b>
-                                    <v>9226</v>
+                                    <v>9204</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29821,15 +29836,15 @@
         </relation>
         <relation>
             <name>varbind</name>
-            <cardinality>6029477</cardinality>
+            <cardinality>6029430</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>6029477</v>
+                    <v>6029430</v>
                 </e>
                 <e>
                     <k>var</k>
-                    <v>768575</v>
+                    <v>768569</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29843,7 +29858,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6029477</v>
+                                    <v>6029430</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29859,22 +29874,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>126229</v>
+                                    <v>126228</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>137882</v>
+                                    <v>137881</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>106299</v>
+                                    <v>106298</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>85216</v>
+                                    <v>85215</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -29914,15 +29929,15 @@
         </relation>
         <relation>
             <name>funbind</name>
-            <cardinality>3187262</cardinality>
+            <cardinality>3188690</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>3183583</v>
+                    <v>3182471</v>
                 </e>
                 <e>
                     <k>fun</k>
-                    <v>512661</v>
+                    <v>512219</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29936,12 +29951,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3179903</v>
+                                    <v>3176253</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3679</v>
+                                    <v>6218</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29957,32 +29972,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>316152</v>
+                                    <v>315736</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>78084</v>
+                                    <v>78026</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>31455</v>
+                                    <v>31396</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>46210</v>
+                                    <v>46153</v>
                                 </b>
                                 <b>
                                     <a>7</a>
-                                    <b>133</b>
-                                    <v>38451</v>
+                                    <b>121</b>
+                                    <v>38471</v>
                                 </b>
                                 <b>
-                                    <a>133</a>
-                                    <b>4992</b>
-                                    <v>2306</v>
+                                    <a>123</a>
+                                    <b>5011</b>
+                                    <v>2434</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29992,11 +30007,11 @@
         </relation>
         <relation>
             <name>expr_allocator</name>
-            <cardinality>45963</cardinality>
+            <cardinality>45951</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>45963</v>
+                    <v>45951</v>
                 </e>
                 <e>
                     <k>func</k>
@@ -30018,7 +30033,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>45963</v>
+                                    <v>45951</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30034,7 +30049,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>45963</v>
+                                    <v>45951</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30118,11 +30133,11 @@
         </relation>
         <relation>
             <name>expr_deallocator</name>
-            <cardinality>54626</cardinality>
+            <cardinality>54613</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>54626</v>
+                    <v>54613</v>
                 </e>
                 <e>
                     <k>func</k>
@@ -30144,7 +30159,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>54626</v>
+                                    <v>54613</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30160,7 +30175,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>54626</v>
+                                    <v>54613</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30265,15 +30280,15 @@
         </relation>
         <relation>
             <name>expr_cond_guard</name>
-            <cardinality>657276</cardinality>
+            <cardinality>657271</cardinality>
             <columnsizes>
                 <e>
                     <k>cond</k>
-                    <v>657276</v>
+                    <v>657271</v>
                 </e>
                 <e>
                     <k>guard</k>
-                    <v>657276</v>
+                    <v>657271</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30287,7 +30302,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>657276</v>
+                                    <v>657271</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30303,7 +30318,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>657276</v>
+                                    <v>657271</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30313,15 +30328,15 @@
         </relation>
         <relation>
             <name>expr_cond_true</name>
-            <cardinality>657273</cardinality>
+            <cardinality>657268</cardinality>
             <columnsizes>
                 <e>
                     <k>cond</k>
-                    <v>657273</v>
+                    <v>657268</v>
                 </e>
                 <e>
                     <k>true</k>
-                    <v>657273</v>
+                    <v>657268</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30335,7 +30350,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>657273</v>
+                                    <v>657268</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30351,7 +30366,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>657273</v>
+                                    <v>657268</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30361,15 +30376,15 @@
         </relation>
         <relation>
             <name>expr_cond_false</name>
-            <cardinality>657276</cardinality>
+            <cardinality>657271</cardinality>
             <columnsizes>
                 <e>
                     <k>cond</k>
-                    <v>657276</v>
+                    <v>657271</v>
                 </e>
                 <e>
                     <k>false</k>
-                    <v>657276</v>
+                    <v>657271</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30383,7 +30398,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>657276</v>
+                                    <v>657271</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30399,7 +30414,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>657276</v>
+                                    <v>657271</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30409,15 +30424,15 @@
         </relation>
         <relation>
             <name>values</name>
-            <cardinality>10777325</cardinality>
+            <cardinality>10777241</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>10777325</v>
+                    <v>10777241</v>
                 </e>
                 <e>
                     <k>str</k>
-                    <v>88068</v>
+                    <v>88067</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30431,7 +30446,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10777325</v>
+                                    <v>10777241</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30540,15 +30555,15 @@
         </relation>
         <relation>
             <name>valuebind</name>
-            <cardinality>11211571</cardinality>
+            <cardinality>11211484</cardinality>
             <columnsizes>
                 <e>
                     <k>val</k>
-                    <v>10777325</v>
+                    <v>10777241</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>11211571</v>
+                    <v>11211484</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30562,12 +30577,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10365623</v>
+                                    <v>10365543</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>411701</v>
+                                    <v>411698</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30583,7 +30598,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11211571</v>
+                                    <v>11211484</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30593,15 +30608,15 @@
         </relation>
         <relation>
             <name>fieldoffsets</name>
-            <cardinality>1054758</cardinality>
+            <cardinality>1054750</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1054758</v>
+                    <v>1054750</v>
                 </e>
                 <e>
                     <k>byteoffset</k>
-                    <v>22694</v>
+                    <v>22693</v>
                 </e>
                 <e>
                     <k>bitoffset</k>
@@ -30619,7 +30634,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1054758</v>
+                                    <v>1054750</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30635,7 +30650,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1054758</v>
+                                    <v>1054750</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30794,19 +30809,19 @@
         </relation>
         <relation>
             <name>bitfield</name>
-            <cardinality>20704</cardinality>
+            <cardinality>20693</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>20704</v>
+                    <v>20693</v>
                 </e>
                 <e>
                     <k>bits</k>
-                    <v>2588</v>
+                    <v>2586</v>
                 </e>
                 <e>
                     <k>declared_bits</k>
-                    <v>2588</v>
+                    <v>2586</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30820,7 +30835,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20704</v>
+                                    <v>20693</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30836,7 +30851,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20704</v>
+                                    <v>20693</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30857,37 +30872,37 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>621</v>
+                                    <v>620</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>207</v>
+                                    <v>206</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>207</v>
+                                    <v>206</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>207</v>
+                                    <v>206</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>207</v>
+                                    <v>206</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>207</v>
+                                    <v>206</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>115</b>
-                                    <v>207</v>
+                                    <v>206</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30903,7 +30918,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2588</v>
+                                    <v>2586</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30924,37 +30939,37 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>621</v>
+                                    <v>620</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>207</v>
+                                    <v>206</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>207</v>
+                                    <v>206</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>207</v>
+                                    <v>206</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>207</v>
+                                    <v>206</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>207</v>
+                                    <v>206</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>115</b>
-                                    <v>207</v>
+                                    <v>206</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30970,7 +30985,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2588</v>
+                                    <v>2586</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30980,23 +30995,23 @@
         </relation>
         <relation>
             <name>initialisers</name>
-            <cardinality>1710241</cardinality>
+            <cardinality>1710223</cardinality>
             <columnsizes>
                 <e>
                     <k>init</k>
-                    <v>1710241</v>
+                    <v>1710223</v>
                 </e>
                 <e>
                     <k>var</k>
-                    <v>719566</v>
+                    <v>719570</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>1710241</v>
+                    <v>1710223</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>394521</v>
+                    <v>394513</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -31010,7 +31025,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1710241</v>
+                                    <v>1710223</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31026,7 +31041,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1710241</v>
+                                    <v>1710223</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31042,7 +31057,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1710241</v>
+                                    <v>1710223</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31058,7 +31073,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>633820</v>
+                                    <v>633825</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31068,7 +31083,7 @@
                                 <b>
                                     <a>16</a>
                                     <b>25</b>
-                                    <v>57022</v>
+                                    <v>57020</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31084,7 +31099,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>633820</v>
+                                    <v>633825</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31094,7 +31109,7 @@
                                 <b>
                                     <a>16</a>
                                     <b>25</b>
-                                    <v>57022</v>
+                                    <v>57020</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31110,7 +31125,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>719560</v>
+                                    <v>719563</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31131,7 +31146,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1710241</v>
+                                    <v>1710223</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31147,7 +31162,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1710241</v>
+                                    <v>1710223</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31163,7 +31178,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1710241</v>
+                                    <v>1710223</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31179,7 +31194,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>321604</v>
+                                    <v>321597</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31189,12 +31204,12 @@
                                 <b>
                                     <a>3</a>
                                     <b>15</b>
-                                    <v>30977</v>
+                                    <v>30976</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>111551</b>
-                                    <v>17983</v>
+                                    <v>17982</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31210,17 +31225,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>344488</v>
+                                    <v>344480</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>36106</v>
+                                    <v>36086</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12073</b>
-                                    <v>13927</v>
+                                    <v>13945</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31236,7 +31251,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>321604</v>
+                                    <v>321597</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31246,12 +31261,12 @@
                                 <b>
                                     <a>3</a>
                                     <b>15</b>
-                                    <v>30977</v>
+                                    <v>30976</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>111551</b>
-                                    <v>17983</v>
+                                    <v>17982</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31272,15 +31287,15 @@
         </relation>
         <relation>
             <name>expr_ancestor</name>
-            <cardinality>475296</cardinality>
+            <cardinality>477285</cardinality>
             <columnsizes>
                 <e>
                     <k>exp</k>
-                    <v>475296</v>
+                    <v>477285</v>
                 </e>
                 <e>
                     <k>ancestor</k>
-                    <v>269541</v>
+                    <v>268993</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -31294,7 +31309,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>475296</v>
+                                    <v>477285</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31310,27 +31325,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>165739</v>
+                                    <v>163963</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>54712</v>
+                                    <v>55148</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>22152</v>
+                                    <v>22496</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>22132</v>
+                                    <v>22592</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>26</b>
-                                    <v>4804</v>
+                                    <v>4792</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31340,11 +31355,11 @@
         </relation>
         <relation>
             <name>exprs</name>
-            <cardinality>18388573</cardinality>
+            <cardinality>18388431</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>18388573</v>
+                    <v>18388431</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -31352,7 +31367,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>8488587</v>
+                    <v>8488521</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -31366,7 +31381,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18388573</v>
+                                    <v>18388431</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31382,7 +31397,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18388573</v>
+                                    <v>18388431</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31560,22 +31575,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7145568</v>
+                                    <v>7145513</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>663069</v>
+                                    <v>663064</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>18</b>
-                                    <v>638140</v>
+                                    <v>638135</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>71656</b>
-                                    <v>41808</v>
+                                    <v>41807</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31591,17 +31606,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7251643</v>
+                                    <v>7251587</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>618277</v>
+                                    <v>618273</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>32</b>
-                                    <v>618666</v>
+                                    <v>618661</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31611,15 +31626,19 @@
         </relation>
         <relation>
             <name>expr_reuse</name>
-            <cardinality>331632</cardinality>
+            <cardinality>333955</cardinality>
             <columnsizes>
                 <e>
                     <k>reuse</k>
-                    <v>331632</v>
+                    <v>333955</v>
                 </e>
                 <e>
                     <k>original</k>
-                    <v>331632</v>
+                    <v>333955</v>
+                </e>
+                <e>
+                    <k>value_category</k>
+                    <v>19</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -31633,7 +31652,23 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>331632</v>
+                                    <v>333955</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>reuse</src>
+                    <trg>value_category</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>333955</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31649,7 +31684,55 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>331632</v>
+                                    <v>333955</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>original</src>
+                    <trg>value_category</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>333955</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>value_category</src>
+                    <trg>reuse</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>17561</a>
+                                    <b>17562</b>
+                                    <v>19</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>value_category</src>
+                    <trg>original</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>17561</a>
+                                    <b>17562</b>
+                                    <v>19</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31659,15 +31742,15 @@
         </relation>
         <relation>
             <name>expr_types</name>
-            <cardinality>18461112</cardinality>
+            <cardinality>18456468</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>18330447</v>
+                    <v>18325931</v>
                 </e>
                 <e>
                     <k>typeid</k>
-                    <v>1237209</v>
+                    <v>1236717</v>
                 </e>
                 <e>
                     <k>value_category</k>
@@ -31685,12 +31768,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18199782</v>
+                                    <v>18195394</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>130664</v>
+                                    <v>130536</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31706,7 +31789,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18330447</v>
+                                    <v>18325931</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31722,42 +31805,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>448184</v>
+                                    <v>448002</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>256965</v>
+                                    <v>256901</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>102788</v>
+                                    <v>102760</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>84133</v>
+                                    <v>84078</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>110196</v>
+                                    <v>110166</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>14</b>
-                                    <v>98435</v>
+                                    <v>98352</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>42</b>
-                                    <v>93511</v>
+                                    <v>93486</v>
                                 </b>
                                 <b>
                                     <a>42</a>
-                                    <b>125366</b>
-                                    <v>42995</v>
+                                    <b>125373</b>
+                                    <v>42967</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31773,17 +31856,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1069468</v>
+                                    <v>1069040</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>157321</v>
+                                    <v>157261</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>10418</v>
+                                    <v>10414</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31802,13 +31885,13 @@
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>372687</a>
-                                    <b>372688</b>
+                                    <a>372581</a>
+                                    <b>372582</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>1250400</a>
-                                    <b>1250401</b>
+                                    <a>1250724</a>
+                                    <b>1250725</b>
                                     <v>11</v>
                                 </b>
                             </bs>
@@ -31833,8 +31916,8 @@
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>92891</a>
-                                    <b>92892</b>
+                                    <a>92889</a>
+                                    <b>92890</b>
                                     <v>11</v>
                                 </b>
                             </bs>
@@ -31845,15 +31928,15 @@
         </relation>
         <relation>
             <name>new_allocated_type</name>
-            <cardinality>47006</cardinality>
+            <cardinality>46995</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>47006</v>
+                    <v>46995</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>27800</v>
+                    <v>27793</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -31867,7 +31950,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>47006</v>
+                                    <v>46995</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31883,17 +31966,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11621</v>
+                                    <v>11618</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>14717</v>
+                                    <v>14714</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>19</b>
-                                    <v>1461</v>
+                                    <v>1460</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32988,15 +33071,15 @@
         </relation>
         <relation>
             <name>condition_decl_bind</name>
-            <cardinality>40853</cardinality>
+            <cardinality>40753</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>40853</v>
+                    <v>40753</v>
                 </e>
                 <e>
                     <k>decl</k>
-                    <v>40853</v>
+                    <v>40753</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33010,7 +33093,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40853</v>
+                                    <v>40753</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33026,7 +33109,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40853</v>
+                                    <v>40753</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33036,15 +33119,15 @@
         </relation>
         <relation>
             <name>typeid_bind</name>
-            <cardinality>35977</cardinality>
+            <cardinality>35968</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>35977</v>
+                    <v>35968</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>16179</v>
+                    <v>16175</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33058,7 +33141,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>35977</v>
+                                    <v>35968</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33074,7 +33157,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15761</v>
+                                    <v>15757</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -33097,7 +33180,7 @@
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>20097</v>
+                    <v>20096</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33127,7 +33210,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19932</v>
+                                    <v>19931</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -33142,15 +33225,15 @@
         </relation>
         <relation>
             <name>sizeof_bind</name>
-            <cardinality>199195</cardinality>
+            <cardinality>199194</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>199195</v>
+                    <v>199194</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>8181</v>
+                    <v>8224</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33164,7 +33247,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>199195</v>
+                                    <v>199194</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33180,12 +33263,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2693</v>
+                                    <v>2704</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2333</v>
+                                    <v>2328</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -33195,7 +33278,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>740</v>
+                                    <v>746</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -33205,12 +33288,12 @@
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>714</v>
+                                    <v>756</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>133</b>
-                                    <v>650</v>
+                                    <v>640</v>
                                 </b>
                                 <b>
                                     <a>164</a>
@@ -33273,11 +33356,11 @@
         </relation>
         <relation>
             <name>lambdas</name>
-            <cardinality>21455</cardinality>
+            <cardinality>21456</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>21455</v>
+                    <v>21456</v>
                 </e>
                 <e>
                     <k>default_capture</k>
@@ -33299,7 +33382,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21455</v>
+                                    <v>21456</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33315,7 +33398,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21455</v>
+                                    <v>21456</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33389,15 +33472,15 @@
         </relation>
         <relation>
             <name>lambda_capture</name>
-            <cardinality>27985</cardinality>
+            <cardinality>27986</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>27985</v>
+                    <v>27986</v>
                 </e>
                 <e>
                     <k>lambda</k>
-                    <v>20522</v>
+                    <v>20523</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -33405,7 +33488,7 @@
                 </e>
                 <e>
                     <k>field</k>
-                    <v>27985</v>
+                    <v>27986</v>
                 </e>
                 <e>
                     <k>captured_by_reference</k>
@@ -33431,7 +33514,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27985</v>
+                                    <v>27986</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33447,7 +33530,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27985</v>
+                                    <v>27986</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33463,7 +33546,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27985</v>
+                                    <v>27986</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33479,7 +33562,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27985</v>
+                                    <v>27986</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33495,7 +33578,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27985</v>
+                                    <v>27986</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33511,7 +33594,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27985</v>
+                                    <v>27986</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33527,12 +33610,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13059</v>
+                                    <v>13060</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7462</v>
+                                    <v>7463</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33548,12 +33631,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13059</v>
+                                    <v>13060</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7462</v>
+                                    <v>7463</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33569,12 +33652,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13059</v>
+                                    <v>13060</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7462</v>
+                                    <v>7463</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33590,7 +33673,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20522</v>
+                                    <v>20523</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33606,7 +33689,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20522</v>
+                                    <v>20523</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33622,12 +33705,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13059</v>
+                                    <v>13060</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7462</v>
+                                    <v>7463</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33759,7 +33842,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27985</v>
+                                    <v>27986</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33775,7 +33858,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27985</v>
+                                    <v>27986</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33791,7 +33874,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27985</v>
+                                    <v>27986</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33807,7 +33890,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27985</v>
+                                    <v>27986</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33823,7 +33906,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27985</v>
+                                    <v>27986</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33839,7 +33922,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27985</v>
+                                    <v>27986</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34268,19 +34351,19 @@
         </relation>
         <relation>
             <name>stmts</name>
-            <cardinality>4619943</cardinality>
+            <cardinality>4618654</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4619943</v>
+                    <v>4618654</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>1966</v>
+                    <v>1965</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2269598</v>
+                    <v>2268406</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34294,7 +34377,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4619943</v>
+                                    <v>4618654</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34310,7 +34393,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4619943</v>
+                                    <v>4618654</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34394,28 +34477,28 @@
                                     <v>103</v>
                                 </b>
                                 <b>
-                                    <a>2635</a>
-                                    <b>2636</b>
+                                    <a>2636</a>
+                                    <b>2637</b>
                                     <v>103</v>
                                 </b>
                                 <b>
-                                    <a>4621</a>
-                                    <b>4622</b>
+                                    <a>4622</a>
+                                    <b>4623</b>
                                     <v>103</v>
                                 </b>
                                 <b>
-                                    <a>8803</a>
-                                    <b>8804</b>
+                                    <a>8806</a>
+                                    <b>8807</b>
                                     <v>103</v>
                                 </b>
                                 <b>
-                                    <a>11577</a>
-                                    <b>11578</b>
+                                    <a>11579</a>
+                                    <b>11580</b>
                                     <v>103</v>
                                 </b>
                                 <b>
-                                    <a>13335</a>
-                                    <b>13336</b>
+                                    <a>13339</a>
+                                    <b>13340</b>
                                     <v>103</v>
                                 </b>
                             </bs>
@@ -34538,22 +34621,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1879323</v>
+                                    <v>1878336</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>174019</v>
+                                    <v>173927</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>174122</v>
+                                    <v>174031</v>
                                 </b>
                                 <b>
                                     <a>12</a>
-                                    <b>687</b>
-                                    <v>42133</v>
+                                    <b>689</b>
+                                    <v>42110</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34569,12 +34652,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2212869</v>
+                                    <v>2211706</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>56729</v>
+                                    <v>56699</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34728,15 +34811,15 @@
         </relation>
         <relation>
             <name>if_then</name>
-            <cardinality>725956</cardinality>
+            <cardinality>725951</cardinality>
             <columnsizes>
                 <e>
                     <k>if_stmt</k>
-                    <v>725956</v>
+                    <v>725951</v>
                 </e>
                 <e>
                     <k>then_id</k>
-                    <v>725956</v>
+                    <v>725951</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34750,7 +34833,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>725956</v>
+                                    <v>725951</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34766,7 +34849,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>725956</v>
+                                    <v>725951</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34776,15 +34859,15 @@
         </relation>
         <relation>
             <name>if_else</name>
-            <cardinality>184680</cardinality>
+            <cardinality>184679</cardinality>
             <columnsizes>
                 <e>
                     <k>if_stmt</k>
-                    <v>184680</v>
+                    <v>184679</v>
                 </e>
                 <e>
                     <k>else_id</k>
-                    <v>184680</v>
+                    <v>184679</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34798,7 +34881,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>184680</v>
+                                    <v>184679</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34814,7 +34897,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>184680</v>
+                                    <v>184679</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34824,15 +34907,15 @@
         </relation>
         <relation>
             <name>constexpr_if_initialization</name>
-            <cardinality>1</cardinality>
+            <cardinality>2</cardinality>
             <columnsizes>
                 <e>
                     <k>constexpr_if_stmt</k>
-                    <v>1</v>
+                    <v>2</v>
                 </e>
                 <e>
                     <k>init_id</k>
-                    <v>1</v>
+                    <v>2</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34846,7 +34929,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>2</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34862,7 +34945,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>2</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34872,15 +34955,15 @@
         </relation>
         <relation>
             <name>constexpr_if_then</name>
-            <cardinality>52071</cardinality>
+            <cardinality>52043</cardinality>
             <columnsizes>
                 <e>
                     <k>constexpr_if_stmt</k>
-                    <v>52071</v>
+                    <v>52043</v>
                 </e>
                 <e>
                     <k>then_id</k>
-                    <v>52071</v>
+                    <v>52043</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34894,7 +34977,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52071</v>
+                                    <v>52043</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34910,7 +34993,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52071</v>
+                                    <v>52043</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34920,15 +35003,15 @@
         </relation>
         <relation>
             <name>constexpr_if_else</name>
-            <cardinality>30538</cardinality>
+            <cardinality>30522</cardinality>
             <columnsizes>
                 <e>
                     <k>constexpr_if_stmt</k>
-                    <v>30538</v>
+                    <v>30522</v>
                 </e>
                 <e>
                     <k>else_id</k>
-                    <v>30538</v>
+                    <v>30522</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34942,7 +35025,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30538</v>
+                                    <v>30522</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34958,7 +35041,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30538</v>
+                                    <v>30522</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34968,15 +35051,15 @@
         </relation>
         <relation>
             <name>while_body</name>
-            <cardinality>29152</cardinality>
+            <cardinality>29141</cardinality>
             <columnsizes>
                 <e>
                     <k>while_stmt</k>
-                    <v>29152</v>
+                    <v>29141</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>29152</v>
+                    <v>29141</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34990,7 +35073,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29152</v>
+                                    <v>29141</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35006,7 +35089,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29152</v>
+                                    <v>29141</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35016,15 +35099,15 @@
         </relation>
         <relation>
             <name>do_body</name>
-            <cardinality>148882</cardinality>
+            <cardinality>148881</cardinality>
             <columnsizes>
                 <e>
                     <k>do_stmt</k>
-                    <v>148882</v>
+                    <v>148881</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>148882</v>
+                    <v>148881</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35038,7 +35121,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>148882</v>
+                                    <v>148881</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35054,7 +35137,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>148882</v>
+                                    <v>148881</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35064,15 +35147,15 @@
         </relation>
         <relation>
             <name>switch_initialization</name>
-            <cardinality>5</cardinality>
+            <cardinality>6</cardinality>
             <columnsizes>
                 <e>
                     <k>switch_stmt</k>
-                    <v>5</v>
+                    <v>6</v>
                 </e>
                 <e>
                     <k>init_id</k>
-                    <v>5</v>
+                    <v>6</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35086,7 +35169,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5</v>
+                                    <v>6</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35102,7 +35185,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5</v>
+                                    <v>6</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35112,19 +35195,19 @@
         </relation>
         <relation>
             <name>switch_case</name>
-            <cardinality>201865</cardinality>
+            <cardinality>207702</cardinality>
             <columnsizes>
                 <e>
                     <k>switch_stmt</k>
-                    <v>10809</v>
+                    <v>11029</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>4689</v>
+                    <v>4678</v>
                 </e>
                 <e>
                     <k>case_id</k>
-                    <v>201865</v>
+                    <v>207702</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35143,52 +35226,52 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2402</v>
+                                    <v>2396</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1753</v>
+                                    <v>1768</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>1048</v>
+                                    <v>1045</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>991</v>
+                                    <v>988</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>533</v>
+                                    <v>532</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>1029</v>
+                                    <v>1026</v>
                                 </b>
                                 <b>
                                     <a>10</a>
-                                    <b>12</b>
-                                    <v>991</v>
+                                    <b>11</b>
+                                    <v>361</v>
                                 </b>
                                 <b>
-                                    <a>12</a>
-                                    <b>25</b>
-                                    <v>838</v>
+                                    <a>11</a>
+                                    <b>14</b>
+                                    <v>1007</v>
                                 </b>
                                 <b>
-                                    <a>30</a>
-                                    <b>152</b>
-                                    <v>819</v>
+                                    <a>14</a>
+                                    <b>31</b>
+                                    <v>931</v>
                                 </b>
                                 <b>
-                                    <a>181</a>
+                                    <a>36</a>
                                     <b>247</b>
-                                    <v>343</v>
+                                    <v>912</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35209,52 +35292,52 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2402</v>
+                                    <v>2396</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1753</v>
+                                    <v>1768</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>1048</v>
+                                    <v>1045</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>991</v>
+                                    <v>988</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>533</v>
+                                    <v>532</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>1029</v>
+                                    <v>1026</v>
                                 </b>
                                 <b>
                                     <a>10</a>
-                                    <b>12</b>
-                                    <v>991</v>
+                                    <b>11</b>
+                                    <v>361</v>
                                 </b>
                                 <b>
-                                    <a>12</a>
-                                    <b>25</b>
-                                    <v>838</v>
+                                    <a>11</a>
+                                    <b>14</b>
+                                    <v>1007</v>
                                 </b>
                                 <b>
-                                    <a>30</a>
-                                    <b>152</b>
-                                    <v>819</v>
+                                    <a>14</a>
+                                    <b>31</b>
+                                    <v>931</v>
                                 </b>
                                 <b>
-                                    <a>181</a>
+                                    <a>36</a>
                                     <b>247</b>
-                                    <v>343</v>
+                                    <v>912</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35270,31 +35353,31 @@
                                 <b>
                                     <a>14</a>
                                     <b>15</b>
-                                    <v>1239</v>
+                                    <v>1236</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>19</b>
-                                    <v>571</v>
-                                </b>
-                                <b>
-                                    <a>32</a>
-                                    <b>33</b>
-                                    <v>2020</v>
+                                    <a>19</a>
+                                    <b>20</b>
+                                    <v>570</v>
                                 </b>
                                 <b>
                                     <a>33</a>
-                                    <b>62</b>
-                                    <v>400</v>
+                                    <b>34</b>
+                                    <v>2015</v>
                                 </b>
                                 <b>
-                                    <a>66</a>
-                                    <b>292</b>
-                                    <v>362</v>
+                                    <a>34</a>
+                                    <b>63</b>
+                                    <v>399</v>
                                 </b>
                                 <b>
-                                    <a>346</a>
-                                    <b>568</b>
+                                    <a>68</a>
+                                    <b>304</b>
+                                    <v>361</v>
+                                </b>
+                                <b>
+                                    <a>358</a>
+                                    <b>581</b>
                                     <v>95</v>
                                 </b>
                             </bs>
@@ -35311,31 +35394,31 @@
                                 <b>
                                     <a>14</a>
                                     <b>15</b>
-                                    <v>1239</v>
+                                    <v>1236</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>19</b>
-                                    <v>571</v>
-                                </b>
-                                <b>
-                                    <a>32</a>
-                                    <b>33</b>
-                                    <v>2020</v>
+                                    <a>19</a>
+                                    <b>20</b>
+                                    <v>570</v>
                                 </b>
                                 <b>
                                     <a>33</a>
-                                    <b>62</b>
-                                    <v>400</v>
+                                    <b>34</b>
+                                    <v>2015</v>
                                 </b>
                                 <b>
-                                    <a>66</a>
-                                    <b>292</b>
-                                    <v>362</v>
+                                    <a>34</a>
+                                    <b>63</b>
+                                    <v>399</v>
                                 </b>
                                 <b>
-                                    <a>346</a>
-                                    <b>568</b>
+                                    <a>68</a>
+                                    <b>304</b>
+                                    <v>361</v>
+                                </b>
+                                <b>
+                                    <a>358</a>
+                                    <b>581</b>
                                     <v>95</v>
                                 </b>
                             </bs>
@@ -35352,7 +35435,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>201865</v>
+                                    <v>207702</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35368,7 +35451,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>201865</v>
+                                    <v>207702</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35378,15 +35461,15 @@
         </relation>
         <relation>
             <name>switch_body</name>
-            <cardinality>20788</cardinality>
+            <cardinality>20787</cardinality>
             <columnsizes>
                 <e>
                     <k>switch_stmt</k>
-                    <v>20788</v>
+                    <v>20787</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>20788</v>
+                    <v>20787</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35400,7 +35483,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20788</v>
+                                    <v>20787</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35416,7 +35499,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20788</v>
+                                    <v>20787</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35426,15 +35509,15 @@
         </relation>
         <relation>
             <name>for_initialization</name>
-            <cardinality>53407</cardinality>
+            <cardinality>53406</cardinality>
             <columnsizes>
                 <e>
                     <k>for_stmt</k>
-                    <v>53407</v>
+                    <v>53406</v>
                 </e>
                 <e>
                     <k>init_id</k>
-                    <v>53407</v>
+                    <v>53406</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35448,7 +35531,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53407</v>
+                                    <v>53406</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35464,7 +35547,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53407</v>
+                                    <v>53406</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35570,15 +35653,15 @@
         </relation>
         <relation>
             <name>for_body</name>
-            <cardinality>61560</cardinality>
+            <cardinality>61559</cardinality>
             <columnsizes>
                 <e>
                     <k>for_stmt</k>
-                    <v>61560</v>
+                    <v>61559</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>61560</v>
+                    <v>61559</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35592,7 +35675,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>61560</v>
+                                    <v>61559</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35608,7 +35691,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>61560</v>
+                                    <v>61559</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35618,11 +35701,11 @@
         </relation>
         <relation>
             <name>stmtparents</name>
-            <cardinality>4054468</cardinality>
+            <cardinality>4054557</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4054468</v>
+                    <v>4054557</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -35630,7 +35713,7 @@
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>1721248</v>
+                    <v>1721299</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35644,7 +35727,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4054468</v>
+                                    <v>4054557</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35660,7 +35743,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4054468</v>
+                                    <v>4054557</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35720,7 +35803,7 @@
                                 </b>
                                 <b>
                                     <a>77</a>
-                                    <b>195132</b>
+                                    <b>195140</b>
                                     <v>704</v>
                                 </b>
                             </bs>
@@ -35781,7 +35864,7 @@
                                 </b>
                                 <b>
                                     <a>77</a>
-                                    <b>195132</b>
+                                    <b>195140</b>
                                     <v>704</v>
                                 </b>
                             </bs>
@@ -35798,27 +35881,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>989113</v>
+                                    <v>989142</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>372551</v>
+                                    <v>372562</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>105697</v>
+                                    <v>105701</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>111251</v>
+                                    <v>111255</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>17</b>
-                                    <v>130351</v>
+                                    <v>130355</v>
                                 </b>
                                 <b>
                                     <a>17</a>
@@ -35839,27 +35922,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>989113</v>
+                                    <v>989142</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>372551</v>
+                                    <v>372562</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>105697</v>
+                                    <v>105701</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>111251</v>
+                                    <v>111255</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>17</b>
-                                    <v>130351</v>
+                                    <v>130355</v>
                                 </b>
                                 <b>
                                     <a>17</a>
@@ -35874,22 +35957,22 @@
         </relation>
         <relation>
             <name>ishandler</name>
-            <cardinality>62891</cardinality>
+            <cardinality>62736</cardinality>
             <columnsizes>
                 <e>
                     <k>block</k>
-                    <v>62891</v>
+                    <v>62736</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>stmt_decl_bind</name>
-            <cardinality>580807</cardinality>
+            <cardinality>580797</cardinality>
             <columnsizes>
                 <e>
                     <k>stmt</k>
-                    <v>540988</v>
+                    <v>540979</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -35897,7 +35980,7 @@
                 </e>
                 <e>
                     <k>decl</k>
-                    <v>580703</v>
+                    <v>580692</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35911,7 +35994,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>520281</v>
+                                    <v>520271</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -35932,7 +36015,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>520281</v>
+                                    <v>520271</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -36135,7 +36218,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>580665</v>
+                                    <v>580655</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -36156,7 +36239,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>580703</v>
+                                    <v>580692</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36166,11 +36249,11 @@
         </relation>
         <relation>
             <name>stmt_decl_entry_bind</name>
-            <cardinality>523682</cardinality>
+            <cardinality>523673</cardinality>
             <columnsizes>
                 <e>
                     <k>stmt</k>
-                    <v>484163</v>
+                    <v>484155</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -36178,7 +36261,7 @@
                 </e>
                 <e>
                     <k>decl_entry</k>
-                    <v>523624</v>
+                    <v>523614</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36192,7 +36275,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>463719</v>
+                                    <v>463710</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -36213,7 +36296,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>463719</v>
+                                    <v>463710</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -36416,7 +36499,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>523603</v>
+                                    <v>523593</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -36437,7 +36520,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>523624</v>
+                                    <v>523614</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36447,15 +36530,15 @@
         </relation>
         <relation>
             <name>blockscope</name>
-            <cardinality>1415581</cardinality>
+            <cardinality>1415642</cardinality>
             <columnsizes>
                 <e>
                     <k>block</k>
-                    <v>1415581</v>
+                    <v>1415642</v>
                 </e>
                 <e>
                     <k>enclosing</k>
-                    <v>1300376</v>
+                    <v>1300432</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36469,7 +36552,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1415581</v>
+                                    <v>1415642</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36485,12 +36568,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1235077</v>
+                                    <v>1235130</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>13</b>
-                                    <v>65298</v>
+                                    <v>65301</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36500,11 +36583,11 @@
         </relation>
         <relation>
             <name>jumpinfo</name>
-            <cardinality>254471</cardinality>
+            <cardinality>254469</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>254471</v>
+                    <v>254469</v>
                 </e>
                 <e>
                     <k>str</k>
@@ -36512,7 +36595,7 @@
                 </e>
                 <e>
                     <k>target</k>
-                    <v>53145</v>
+                    <v>53144</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36526,7 +36609,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>254471</v>
+                                    <v>254469</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36542,7 +36625,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>254471</v>
+                                    <v>254469</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36640,7 +36723,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>26478</v>
+                                    <v>26477</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -36676,7 +36759,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53145</v>
+                                    <v>53144</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36686,11 +36769,11 @@
         </relation>
         <relation>
             <name>preprocdirects</name>
-            <cardinality>4389195</cardinality>
+            <cardinality>4386889</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4389195</v>
+                    <v>4386889</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -36698,7 +36781,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>4386607</v>
+                    <v>4384302</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36712,7 +36795,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4389195</v>
+                                    <v>4386889</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36728,7 +36811,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4389195</v>
+                                    <v>4386889</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36876,7 +36959,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4386503</v>
+                                    <v>4384198</v>
                                 </b>
                                 <b>
                                     <a>26</a>
@@ -36897,7 +36980,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4386607</v>
+                                    <v>4384302</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36907,15 +36990,15 @@
         </relation>
         <relation>
             <name>preprocpair</name>
-            <cardinality>1430040</cardinality>
+            <cardinality>1430102</cardinality>
             <columnsizes>
                 <e>
                     <k>begin</k>
-                    <v>1195898</v>
+                    <v>1195950</v>
                 </e>
                 <e>
                     <k>elseelifend</k>
-                    <v>1430040</v>
+                    <v>1430102</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36929,12 +37012,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>977614</v>
+                                    <v>977656</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>208022</v>
+                                    <v>208031</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -36955,7 +37038,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1430040</v>
+                                    <v>1430102</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36965,41 +37048,41 @@
         </relation>
         <relation>
             <name>preproctrue</name>
-            <cardinality>766326</cardinality>
+            <cardinality>766359</cardinality>
             <columnsizes>
                 <e>
                     <k>branch</k>
-                    <v>766326</v>
+                    <v>766359</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>preprocfalse</name>
-            <cardinality>331157</cardinality>
+            <cardinality>331171</cardinality>
             <columnsizes>
                 <e>
                     <k>branch</k>
-                    <v>331157</v>
+                    <v>331171</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>preproctext</name>
-            <cardinality>3539079</cardinality>
+            <cardinality>3537219</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3539079</v>
+                    <v>3537219</v>
                 </e>
                 <e>
                     <k>head</k>
-                    <v>2564841</v>
+                    <v>2563493</v>
                 </e>
                 <e>
                     <k>body</k>
-                    <v>1498986</v>
+                    <v>1498199</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37013,7 +37096,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3539079</v>
+                                    <v>3537219</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37029,7 +37112,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3539079</v>
+                                    <v>3537219</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37045,12 +37128,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2418979</v>
+                                    <v>2417708</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>740</b>
-                                    <v>145861</v>
+                                    <v>145784</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37066,12 +37149,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2503142</v>
+                                    <v>2501827</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>61698</v>
+                                    <v>61666</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37087,17 +37170,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1356955</v>
+                                    <v>1356242</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>112424</v>
+                                    <v>112364</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>11630</b>
-                                    <v>29607</v>
+                                    <v>29591</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37113,17 +37196,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1359957</v>
+                                    <v>1359243</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>112734</v>
+                                    <v>112675</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>2980</b>
-                                    <v>26294</v>
+                                    <v>26280</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37133,15 +37216,15 @@
         </relation>
         <relation>
             <name>includes</name>
-            <cardinality>312967</cardinality>
+            <cardinality>312980</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>312967</v>
+                    <v>312980</v>
                 </e>
                 <e>
                     <k>included</k>
-                    <v>117071</v>
+                    <v>117076</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37155,7 +37238,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>312967</v>
+                                    <v>312980</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37171,12 +37254,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>61100</v>
+                                    <v>61103</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>21921</v>
+                                    <v>21922</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -37191,7 +37274,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>14</b>
-                                    <v>8861</v>
+                                    <v>8862</v>
                                 </b>
                                 <b>
                                     <a>14</a>
@@ -37206,15 +37289,15 @@
         </relation>
         <relation>
             <name>link_targets</name>
-            <cardinality>819</cardinality>
+            <cardinality>817</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>819</v>
+                    <v>817</v>
                 </e>
                 <e>
                     <k>binary</k>
-                    <v>819</v>
+                    <v>817</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37228,7 +37311,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>819</v>
+                                    <v>817</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37244,7 +37327,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>819</v>
+                                    <v>817</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37254,11 +37337,11 @@
         </relation>
         <relation>
             <name>link_parent</name>
-            <cardinality>38877182</cardinality>
+            <cardinality>38867468</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
-                    <v>4927618</v>
+                    <v>4926386</v>
                 </e>
                 <e>
                     <k>link_target</k>
@@ -37276,17 +37359,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>664255</v>
+                                    <v>664089</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>9</b>
-                                    <v>25852</v>
+                                    <v>25845</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>4237510</v>
+                                    <v>4236452</v>
                                 </b>
                             </bs>
                         </hist>
diff --git a/cpp/ql/lib/upgrades/aa7ff0ab32cd4674f6ab731d32fea64116997b05/expr_reuse.ql b/cpp/ql/lib/upgrades/aa7ff0ab32cd4674f6ab731d32fea64116997b05/expr_reuse.ql
new file mode 100644
index 00000000000..e0648d97b73
--- /dev/null
+++ b/cpp/ql/lib/upgrades/aa7ff0ab32cd4674f6ab731d32fea64116997b05/expr_reuse.ql
@@ -0,0 +1,7 @@
+class Expr extends @expr {
+  string toString() { none() }
+}
+
+from Expr reuse, Expr original, int value_category
+where expr_reuse(reuse, original) and expr_types(original, _, value_category)
+select reuse, original, value_category
diff --git a/cpp/ql/lib/upgrades/aa7ff0ab32cd4674f6ab731d32fea64116997b05/old.dbscheme b/cpp/ql/lib/upgrades/aa7ff0ab32cd4674f6ab731d32fea64116997b05/old.dbscheme
new file mode 100644
index 00000000000..aa7ff0ab32c
--- /dev/null
+++ b/cpp/ql/lib/upgrades/aa7ff0ab32cd4674f6ab731d32fea64116997b05/old.dbscheme
@@ -0,0 +1,2250 @@
+
+/**
+ * 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,
+  int handle: @variable ref,
+  int promise: @variable 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)
+
+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
+);
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default 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
+);
+
+/*
+  Fixed point types
+  precision(1) = short, precision(2) = default, precision(3) = long
+  is_unsigned(1) = unsigned is_unsigned(2) = signed
+  is_fract_type(1) = declared with _Fract
+  saturating(1) = declared with _Sat
+*/
+/* TODO
+fixedpointtypes(
+    unique int id: @fixedpointtype,
+    int precision: int ref,
+    int is_unsigned: int ref,
+    int is_fract_type: int ref,
+    int saturating: int 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
+);
+
+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
+            ;
+
+/*
+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
+
+/*
+  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
+);
+
+/*
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 3 = size_and_alignment
+  ;
+*/
+
+/**
+ * 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
+)
+
+/*
+  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
+;
+
+@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
+            ;
+
+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;
+
+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/aa7ff0ab32cd4674f6ab731d32fea64116997b05/semmlecode.cpp.dbscheme b/cpp/ql/lib/upgrades/aa7ff0ab32cd4674f6ab731d32fea64116997b05/semmlecode.cpp.dbscheme
new file mode 100644
index 00000000000..abfce5c170f
--- /dev/null
+++ b/cpp/ql/lib/upgrades/aa7ff0ab32cd4674f6ab731d32fea64116997b05/semmlecode.cpp.dbscheme
@@ -0,0 +1,2251 @@
+
+/**
+ * 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,
+  int handle: @variable ref,
+  int promise: @variable 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)
+
+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
+);
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default 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
+);
+
+/*
+  Fixed point types
+  precision(1) = short, precision(2) = default, precision(3) = long
+  is_unsigned(1) = unsigned is_unsigned(2) = signed
+  is_fract_type(1) = declared with _Fract
+  saturating(1) = declared with _Sat
+*/
+/* TODO
+fixedpointtypes(
+    unique int id: @fixedpointtype,
+    int precision: int ref,
+    int is_unsigned: int ref,
+    int is_fract_type: int ref,
+    int saturating: int 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
+);
+
+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
+            ;
+
+/*
+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
+
+/*
+  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
+);
+
+/*
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 3 = size_and_alignment
+  ;
+*/
+
+/**
+ * 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
+;
+
+@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
+            ;
+
+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;
+
+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/aa7ff0ab32cd4674f6ab731d32fea64116997b05/upgrade.properties b/cpp/ql/lib/upgrades/aa7ff0ab32cd4674f6ab731d32fea64116997b05/upgrade.properties
new file mode 100644
index 00000000000..82bbbe273cd
--- /dev/null
+++ b/cpp/ql/lib/upgrades/aa7ff0ab32cd4674f6ab731d32fea64116997b05/upgrade.properties
@@ -0,0 +1,3 @@
+description: Add value category to expr_reuse table
+compatibility: full
+expr_reuse.rel: run expr_reuse.qlo