diff --git a/cpp/downgrades/23f7cbb88a4eb29f30c3490363dc201bc054c5ff/exprs.ql b/cpp/downgrades/23f7cbb88a4eb29f30c3490363dc201bc054c5ff/exprs.ql
new file mode 100644
index 00000000000..d00685e7cc6
--- /dev/null
+++ b/cpp/downgrades/23f7cbb88a4eb29f30c3490363dc201bc054c5ff/exprs.ql
@@ -0,0 +1,17 @@
+class Expr extends @expr {
+  string toString() { none() }
+}
+
+class Location extends @location_expr {
+  string toString() { none() }
+}
+
+predicate isExprWithNewBuiltin(Expr expr) {
+  exists(int kind | exprs(expr, kind, _) | 330 <= kind and kind <= 334)
+}
+
+from Expr expr, int kind, int kind_new, Location location
+where
+  exprs(expr, kind, location) and
+  if isExprWithNewBuiltin(expr) then kind_new = 0 else kind_new = kind
+select expr, kind_new, location
diff --git a/cpp/downgrades/23f7cbb88a4eb29f30c3490363dc201bc054c5ff/old.dbscheme b/cpp/downgrades/23f7cbb88a4eb29f30c3490363dc201bc054c5ff/old.dbscheme
new file mode 100644
index 00000000000..23f7cbb88a4
--- /dev/null
+++ b/cpp/downgrades/23f7cbb88a4eb29f30c3490363dc201bc054c5ff/old.dbscheme
@@ -0,0 +1,2125 @@
+
+/**
+ * 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
+ */
+
+@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 @macroinvocations.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
+  | 2 = constructor
+  | 3 = destructor
+  | 4 = conversion
+  | 5 = operator
+  | 6 = builtin     // GCC built-in functions, e.g. __builtin___memcpy_chk
+  ;
+*/
+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);
+
+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
+);
+
+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 = error
+  | 2 = unknown
+  | 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 = __int8                 // Microsoft-specific
+  | 21 = __int16                // Microsoft-specific
+  | 22 = __int32                // Microsoft-specific
+  | 23 = __int64                // Microsoft-specific
+  | 24 = float
+  | 25 = double
+  | 26 = long_double
+  | 27 = _Complex_float         // C99-specific
+  | 28 = _Complex_double        // C99-specific
+  | 29 = _Complex_long double   // C99-specific
+  | 30 = _Imaginary_float       // C99-specific
+  | 31 = _Imaginary_double      // C99-specific
+  | 32 = _Imaginary_long_double // C99-specific
+  | 33 = wchar_t                // Microsoft-specific
+  | 34 = decltype_nullptr       // C++11
+  | 35 = __int128
+  | 36 = unsigned___int128
+  | 37 = signed___int128
+  | 38 = __float128
+  | 39 = _Complex___float128
+  | 40 = _Decimal32
+  | 41 = _Decimal64
+  | 42 = _Decimal128
+  | 43 = char16_t
+  | 44 = char32_t
+  | 45 = _Float32
+  | 46 = _Float32x
+  | 47 = _Float64
+  | 48 = _Float64x
+  | 49 = _Float128
+  | 50 = _Float128x
+  | 51 = char8_t
+  ;
+*/
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/*
+  Derived types are types that are directly derived from existing types and
+  point to, refer to, transform type data to return a new type.
+
+  case @derivedtype.kind of
+    1 = pointer
+  | 2 = reference
+  | 3 = type_with_specifiers
+  | 4 = array
+  | 5 = gnu_vector
+  | 6 = routineptr
+  | 7 = routinereference
+  | 8 = rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+  | 10 = block
+  ;
+*/
+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
+);
+
+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 EDG frontend.  See symbol_ref.h there.
+    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
+;
+
+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_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
+                     | @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr | @assign_bitwise_expr
+
+@assign_expr = @assignexpr | @assign_op_expr
+
+/*
+  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
+);
+
+/*
+  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 // EDG 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
+;
+
+@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
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            ;
+
+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.
+ */
+#keyset[aggregate, field]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array.
+ */
+#keyset[aggregate, element_index]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: 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
+);
+
+for_initialization(
+    unique int for_stmt: @stmt_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(
+    unique 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/23f7cbb88a4eb29f30c3490363dc201bc054c5ff/semmlecode.cpp.dbscheme b/cpp/downgrades/23f7cbb88a4eb29f30c3490363dc201bc054c5ff/semmlecode.cpp.dbscheme
new file mode 100644
index 00000000000..19e31bf071f
--- /dev/null
+++ b/cpp/downgrades/23f7cbb88a4eb29f30c3490363dc201bc054c5ff/semmlecode.cpp.dbscheme
@@ -0,0 +1,2115 @@
+
+/**
+ * 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
+ */
+
+@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 @macroinvocations.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
+  | 2 = constructor
+  | 3 = destructor
+  | 4 = conversion
+  | 5 = operator
+  | 6 = builtin     // GCC built-in functions, e.g. __builtin___memcpy_chk
+  ;
+*/
+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);
+
+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
+);
+
+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 = error
+  | 2 = unknown
+  | 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 = __int8                 // Microsoft-specific
+  | 21 = __int16                // Microsoft-specific
+  | 22 = __int32                // Microsoft-specific
+  | 23 = __int64                // Microsoft-specific
+  | 24 = float
+  | 25 = double
+  | 26 = long_double
+  | 27 = _Complex_float         // C99-specific
+  | 28 = _Complex_double        // C99-specific
+  | 29 = _Complex_long double   // C99-specific
+  | 30 = _Imaginary_float       // C99-specific
+  | 31 = _Imaginary_double      // C99-specific
+  | 32 = _Imaginary_long_double // C99-specific
+  | 33 = wchar_t                // Microsoft-specific
+  | 34 = decltype_nullptr       // C++11
+  | 35 = __int128
+  | 36 = unsigned___int128
+  | 37 = signed___int128
+  | 38 = __float128
+  | 39 = _Complex___float128
+  | 40 = _Decimal32
+  | 41 = _Decimal64
+  | 42 = _Decimal128
+  | 43 = char16_t
+  | 44 = char32_t
+  | 45 = _Float32
+  | 46 = _Float32x
+  | 47 = _Float64
+  | 48 = _Float64x
+  | 49 = _Float128
+  | 50 = _Float128x
+  | 51 = char8_t
+  ;
+*/
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/*
+  Derived types are types that are directly derived from existing types and
+  point to, refer to, transform type data to return a new type.
+
+  case @derivedtype.kind of
+    1 = pointer
+  | 2 = reference
+  | 3 = type_with_specifiers
+  | 4 = array
+  | 5 = gnu_vector
+  | 6 = routineptr
+  | 7 = routinereference
+  | 8 = rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+  | 10 = block
+  ;
+*/
+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
+);
+
+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 EDG frontend.  See symbol_ref.h there.
+    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
+;
+
+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_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
+                     | @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr | @assign_bitwise_expr
+
+@assign_expr = @assignexpr | @assign_op_expr
+
+/*
+  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
+);
+
+/*
+  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 // EDG 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
+;
+
+@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
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            ;
+
+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.
+ */
+#keyset[aggregate, field]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array.
+ */
+#keyset[aggregate, element_index]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: 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
+);
+
+for_initialization(
+    unique int for_stmt: @stmt_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(
+    unique 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/23f7cbb88a4eb29f30c3490363dc201bc054c5ff/upgrade.properties b/cpp/downgrades/23f7cbb88a4eb29f30c3490363dc201bc054c5ff/upgrade.properties
new file mode 100644
index 00000000000..d697a16a42f
--- /dev/null
+++ b/cpp/downgrades/23f7cbb88a4eb29f30c3490363dc201bc054c5ff/upgrade.properties
@@ -0,0 +1,3 @@
+description: Add new builtin operations
+compatibility: partial
+exprs.rel: run exprs.qlo
diff --git a/cpp/ql/lib/change-notes/2022-07-26-additional-builtin-support.md b/cpp/ql/lib/change-notes/2022-07-26-additional-builtin-support.md
new file mode 100644
index 00000000000..2e4d7db69a5
--- /dev/null
+++ b/cpp/ql/lib/change-notes/2022-07-26-additional-builtin-support.md
@@ -0,0 +1,4 @@
+---
+category: feature
+---
+* Added subclasses of `BuiltInOperations` for `__builtin_bit_cast`, `__builtin_shuffle`, `__has_unique_object_representations`, `__is_aggregate`, and `__is_assignable`.
diff --git a/cpp/ql/lib/semmle/code/cpp/exprs/BuiltInOperations.qll b/cpp/ql/lib/semmle/code/cpp/exprs/BuiltInOperations.qll
index 309d98cd694..979c9c03940 100644
--- a/cpp/ql/lib/semmle/code/cpp/exprs/BuiltInOperations.qll
+++ b/cpp/ql/lib/semmle/code/cpp/exprs/BuiltInOperations.qll
@@ -1,5 +1,5 @@
 /**
- * Provides classes for modeling built-in operations.  Built-in operations are
+ * Provides classes for modeling built-in operations. Built-in operations are
  * typically compiler specific and are used by libraries and generated code.
  */
 
@@ -120,8 +120,8 @@ class BuiltInNoOp extends BuiltInOperation, @noopexpr {
 
 /**
  * A C/C++ `__builtin_offsetof` built-in operation (used by some implementations
- * of `offsetof`).  The operation retains its semantics even in the presence
- * of an overloaded `operator &`).  This is a GNU/Clang extension.
+ * of `offsetof`). The operation retains its semantics even in the presence
+ * of an overloaded `operator &`). This is a gcc/clang extension.
  * ```
  * struct S {
  *   int a, b;
@@ -137,8 +137,8 @@ class BuiltInOperationBuiltInOffsetOf extends BuiltInOperation, @offsetofexpr {
 
 /**
  * A C/C++ `__INTADDR__` built-in operation (used by some implementations
- * of `offsetof`).  The operation retains its semantics even in the presence
- * of an overloaded `operator &`).  This is an EDG extension.
+ * of `offsetof`). The operation retains its semantics even in the presence
+ * of an overloaded `operator &`). This is an EDG extension.
  * ```
  * struct S {
  *   int a, b;
@@ -173,7 +173,7 @@ class BuiltInOperationHasAssign extends BuiltInOperation, @hasassignexpr {
  *
  * Returns `true` if the type has a copy constructor.
  * ```
- * std::integral_constant< bool, __has_copy(_Tp)> hc;
+ * std::integral_constant<bool, __has_copy(_Tp)> hc;
  * ```
  */
 class BuiltInOperationHasCopy extends BuiltInOperation, @hascopyexpr {
@@ -189,7 +189,7 @@ class BuiltInOperationHasCopy extends BuiltInOperation, @hascopyexpr {
  * Returns `true` if a copy assignment operator has an empty exception
  * specification.
  * ```
- * std::integral_constant< bool, __has_nothrow_assign(_Tp)> hnta;
+ * std::integral_constant<bool, __has_nothrow_assign(_Tp)> hnta;
  * ```
  */
 class BuiltInOperationHasNoThrowAssign extends BuiltInOperation, @hasnothrowassign {
@@ -220,7 +220,7 @@ class BuiltInOperationHasNoThrowConstructor extends BuiltInOperation, @hasnothro
  *
  * Returns `true` if the copy constructor has an empty exception specification.
  * ```
- * std::integral_constant< bool, __has_nothrow_copy(MyType) >;
+ * std::integral_constant<bool, __has_nothrow_copy(MyType) >;
  * ```
  */
 class BuiltInOperationHasNoThrowCopy extends BuiltInOperation, @hasnothrowcopy {
@@ -266,7 +266,7 @@ class BuiltInOperationHasTrivialConstructor extends BuiltInOperation, @hastrivia
  *
  * Returns true if the type has a trivial copy constructor.
  * ```
- * std::integral_constant< bool, __has_trivial_copy(MyType) > htc;
+ * std::integral_constant<bool, __has_trivial_copy(MyType)> htc;
  * ```
  */
 class BuiltInOperationHasTrivialCopy extends BuiltInOperation, @hastrivialcopy {
@@ -468,7 +468,7 @@ class BuiltInOperationIsUnion extends BuiltInOperation, @isunionexpr {
  * ```
  * template<typename _Tp1, typename _Tp2>
  *   struct types_compatible
- *   : public integral_constant<bool, __builtin_types_compatible_p(_Tp1, _Tp2) >
+ *   : public integral_constant<bool, __builtin_types_compatible_p(_Tp1, _Tp2)>
  *   { };
  * ```
  */
@@ -479,8 +479,7 @@ class BuiltInOperationBuiltInTypesCompatibleP extends BuiltInOperation, @typesco
 /**
  * A clang `__builtin_shufflevector` expression.
  *
- * It outputs a permutation of elements from one or two input vectors.
- * Please see
+ * It outputs a permutation of elements from one or two input vectors. See
  * https://releases.llvm.org/3.7.0/tools/clang/docs/LanguageExtensions.html#langext-builtin-shufflevector
  * for more information.
  * ```
@@ -494,11 +493,29 @@ class BuiltInOperationBuiltInShuffleVector extends BuiltInOperation, @builtinshu
   override string getAPrimaryQlClass() { result = "BuiltInOperationBuiltInShuffleVector" }
 }
 
+/**
+ * A gcc `__builtin_shuffle` expression.
+ *
+ * It outputs a permutation of elements from one or two input vectors.
+ * See https://gcc.gnu.org/onlinedocs/gcc/Vector-Extensions.html
+ * for more information.
+ * ```
+ * // Concatenate every other element of 4-element vectors V1 and V2.
+ * M = {0, 2, 4, 6};
+ * V3 = __builtin_shuffle(V1, V2, M);
+ * ```
+ */
+class BuiltInOperationBuiltInShuffle extends BuiltInOperation, @builtinshuffle {
+  override string toString() { result = "__builtin_shuffle" }
+
+  override string getAPrimaryQlClass() { result = "BuiltInOperationBuiltInShuffle" }
+}
+
 /**
  * A clang `__builtin_convertvector` expression.
  *
  * Allows for conversion of vectors of equal element count and compatible
- * element types. Please see
+ * element types. See
  * https://releases.llvm.org/3.7.0/tools/clang/docs/LanguageExtensions.html#builtin-convertvector
  * for more information.
  * ```
@@ -547,7 +564,7 @@ class BuiltInOperationBuiltInAddressOf extends UnaryOperation, BuiltInOperation,
  * ```
  * template<typename T, typename... Args>
  *   struct is_trivially_constructible
- *   : public integral_constant<bool, __is_trivially_constructible(T, Args...) >
+ *   : public integral_constant<bool, __is_trivially_constructible(T, Args...)>
  *   { };
  * ```
  */
@@ -612,13 +629,10 @@ class BuiltInOperationIsTriviallyDestructible extends BuiltInOperation, @istrivi
  * The `__is_trivially_assignable` built-in operation (used by some
  * implementations of the `<type_traits>` header).
  *
- * Returns `true` if the assignment operator `C::operator =(const C& c)` is
- * trivial.
+ * Returns `true` if the assignment operator `C::operator =(const D& d)` is
+ * trivial (i.e., it will not call any operation that is non-trivial).
  * ```
- * template<typename T>
- *   struct is_trivially_assignable
- *   : public integral_constant<bool, __is_trivially_assignable(T) >
- *   { };
+ * bool v = __is_trivially_assignable(MyType1, MyType2);
  * ```
  */
 class BuiltInOperationIsTriviallyAssignable extends BuiltInOperation, @istriviallyassignableexpr {
@@ -631,10 +645,10 @@ class BuiltInOperationIsTriviallyAssignable extends BuiltInOperation, @istrivial
  * The `__is_nothrow_assignable` built-in operation (used by some
  * implementations of the `<type_traits>` header).
  *
- * Returns true if there exists a `C::operator =(const C& c) nothrow`
+ * Returns true if there exists a `C::operator =(const D& d) nothrow`
  * assignment operator (i.e, with an empty exception specification).
  * ```
- * bool v = __is_nothrow_assignable(MyType);
+ * bool v = __is_nothrow_assignable(MyType1, MyType2);
  * ```
  */
 class BuiltInOperationIsNothrowAssignable extends BuiltInOperation, @isnothrowassignableexpr {
@@ -643,15 +657,30 @@ class BuiltInOperationIsNothrowAssignable extends BuiltInOperation, @isnothrowas
   override string getAPrimaryQlClass() { result = "BuiltInOperationIsNothrowAssignable" }
 }
 
+/**
+ * The `__is_assignable` built-in operation (used by some implementations
+ * of the `<type_traits>` header).
+ *
+ * Returns true if there exists a `C::operator =(const D& d)` assignment
+ * operator.
+ * ```
+ * bool v = __is_assignable(MyType1, MyType2);
+ * ```
+ */
+class BuiltInOperationIsAssignable extends BuiltInOperation, @isassignable {
+  override string toString() { result = "__is_assignable" }
+
+  override string getAPrimaryQlClass() { result = "BuiltInOperationIsAssignable" }
+}
+
 /**
  * The `__is_standard_layout` built-in operation (used by some implementations
  * of the `<type_traits>` header).
  *
  * Returns `true` if the type is a primitive type, or a `class`, `struct` or
- * `union` WITHOUT (1) virtual functions or base classes, (2) reference member
- * variable or (3) multiple occurrences of base `class` objects, among other
- * restrictions.  Please see
- * https://en.cppreference.com/w/cpp/named_req/StandardLayoutType
+ * `union` without (1) virtual functions or base classes, (2) reference member
+ * variable, or (3) multiple occurrences of base `class` objects, among other
+ * restrictions. See https://en.cppreference.com/w/cpp/named_req/StandardLayoutType
  * for more information.
  * ```
  * bool v = __is_standard_layout(MyType);
@@ -668,7 +697,7 @@ class BuiltInOperationIsStandardLayout extends BuiltInOperation, @isstandardlayo
  * implementations of the `<type_traits>` header).
  *
  * Returns `true` if instances of this type can be copied by trivial
- * means.  The copying is done in a manner similar to the `memcpy`
+ * means. The copying is done in a manner similar to the `memcpy`
  * function.
  */
 class BuiltInOperationIsTriviallyCopyable extends BuiltInOperation, @istriviallycopyableexpr {
@@ -682,13 +711,13 @@ class BuiltInOperationIsTriviallyCopyable extends BuiltInOperation, @istrivially
  * the `<type_traits>` header).
  *
  * Returns `true` if the type is a scalar type, a reference type or an array of
- * literal types, among others. Please see
+ * literal types, among others. See
  * https://en.cppreference.com/w/cpp/named_req/LiteralType
  * for more information.
  *
  * ```
  * template <typename _Tp>
- * std::integral_constant< bool, __is_literal_type(_Tp)> ilt;
+ * std::integral_constant<bool, __is_literal_type(_Tp)> ilt;
  * ```
  */
 class BuiltInOperationIsLiteralType extends BuiltInOperation, @isliteraltypeexpr {
@@ -705,7 +734,7 @@ class BuiltInOperationIsLiteralType extends BuiltInOperation, @isliteraltypeexpr
  * compiler, with semantics of the `memcpy` operation.
  * ```
  * template <typename _Tp>
- * std::integral_constant< bool, __has_trivial_move_constructor(_Tp)> htmc;
+ * std::integral_constant<bool, __has_trivial_move_constructor(_Tp)> htmc;
  * ```
  */
 class BuiltInOperationHasTrivialMoveConstructor extends BuiltInOperation,
@@ -723,7 +752,7 @@ class BuiltInOperationHasTrivialMoveConstructor extends BuiltInOperation,
  * ```
  * template<typename T>
  *   struct has_trivial_move_assign
- *   : public integral_constant<bool, __has_trivial_move_assign(T) >
+ *   : public integral_constant<bool, __has_trivial_move_assign(T)>
  *   { };
  * ```
  */
@@ -758,7 +787,7 @@ class BuiltInOperationHasNothrowMoveAssign extends BuiltInOperation, @hasnothrow
  * ```
  * template<typename T, typename... Args>
  *   struct is_constructible
- *   : public integral_constant<bool, __is_constructible(T, Args...) >
+ *   : public integral_constant<bool, __is_constructible(T, Args...)>
  *   { };
  * ```
  */
@@ -785,7 +814,7 @@ class BuiltInOperationIsNothrowConstructible extends BuiltInOperation, @isnothro
 }
 
 /**
- * The `__has_finalizer` built-in operation.  This is a Microsoft extension.
+ * The `__has_finalizer` built-in operation. This is a Microsoft extension.
  *
  * Returns `true` if the type defines a _finalizer_ `C::!C(void)`, to be called
  * from either the regular destructor or the garbage collector.
@@ -800,10 +829,10 @@ class BuiltInOperationHasFinalizer extends BuiltInOperation, @hasfinalizerexpr {
 }
 
 /**
- * The `__is_delegate` built-in operation.  This is a Microsoft extension.
+ * The `__is_delegate` built-in operation. This is a Microsoft extension.
  *
  * Returns `true` if the function has been declared as a `delegate`, used in
- * message forwarding.  Please see
+ * message forwarding. See
  * https://docs.microsoft.com/en-us/cpp/extensions/delegate-cpp-component-extensions
  * for more information.
  */
@@ -814,9 +843,9 @@ class BuiltInOperationIsDelegate extends BuiltInOperation, @isdelegateexpr {
 }
 
 /**
- * The `__is_interface_class` built-in operation.  This is a Microsoft extension.
+ * The `__is_interface_class` built-in operation. This is a Microsoft extension.
  *
- * Returns `true` if the type has been declared as an `interface`.  Please see
+ * Returns `true` if the type has been declared as an `interface`. See
  * https://docs.microsoft.com/en-us/cpp/extensions/interface-class-cpp-component-extensions
  * for more information.
  */
@@ -827,9 +856,9 @@ class BuiltInOperationIsInterfaceClass extends BuiltInOperation, @isinterfacecla
 }
 
 /**
- * The `__is_ref_array` built-in operation.  This is a Microsoft extension.
+ * The `__is_ref_array` built-in operation. This is a Microsoft extension.
  *
- * Returns `true` if the object passed in is a _platform array_.  Please see
+ * Returns `true` if the object passed in is a _platform array_. See
  * https://docs.microsoft.com/en-us/cpp/extensions/arrays-cpp-component-extensions
  * for more information.
  * ```
@@ -844,9 +873,9 @@ class BuiltInOperationIsRefArray extends BuiltInOperation, @isrefarrayexpr {
 }
 
 /**
- * The `__is_ref_class` built-in operation.  This is a Microsoft extension.
+ * The `__is_ref_class` built-in operation. This is a Microsoft extension.
  *
- * Returns `true` if the type is a _reference class_.  Please see
+ * Returns `true` if the type is a _reference class_. See
  * https://docs.microsoft.com/en-us/cpp/extensions/classes-and-structs-cpp-component-extensions
  * for more information.
  * ```
@@ -861,10 +890,10 @@ class BuiltInOperationIsRefClass extends BuiltInOperation, @isrefclassexpr {
 }
 
 /**
- * The `__is_sealed` built-in operation.  This is a Microsoft extension.
+ * The `__is_sealed` built-in operation. This is a Microsoft extension.
  *
  * Returns `true` if a given class or virtual function is marked as `sealed`,
- * meaning that it cannot be extended or overridden.  The `sealed` keyword
+ * meaning that it cannot be extended or overridden. The `sealed` keyword
  * is similar to the C++11 `final` keyword.
  * ```
  * ref class X sealed {
@@ -879,7 +908,7 @@ class BuiltInOperationIsSealed extends BuiltInOperation, @issealedexpr {
 }
 
 /**
- * The `__is_simple_value_class` built-in operation.  This is a Microsoft extension.
+ * The `__is_simple_value_class` built-in operation. This is a Microsoft extension.
  *
  * Returns `true` if passed a value type that contains no references to the
  * garbage-collected heap.
@@ -898,9 +927,9 @@ class BuiltInOperationIsSimpleValueClass extends BuiltInOperation, @issimplevalu
 }
 
 /**
- * The `__is_value_class` built-in operation.  This is a Microsoft extension.
+ * The `__is_value_class` built-in operation. This is a Microsoft extension.
  *
- * Returns `true` if passed a value type.  Please see
+ * Returns `true` if passed a value type. See
  * https://docs.microsoft.com/en-us/cpp/extensions/classes-and-structs-cpp-component-extensions
  * For more information.
  * ```
@@ -922,7 +951,7 @@ class BuiltInOperationIsValueClass extends BuiltInOperation, @isvalueclassexpr {
  * ```
  * template<typename T>
  *   struct is_final
- *   : public integral_constant<bool, __is_final(T) >
+ *   : public integral_constant<bool, __is_final(T)>
  *   { };
  * ```
  */
@@ -933,7 +962,7 @@ class BuiltInOperationIsFinal extends BuiltInOperation, @isfinalexpr {
 }
 
 /**
- * The `__builtin_choose_expr` expression.  This is a GNU/Clang extension.
+ * The `__builtin_choose_expr` expression. This is a gcc/clang extension.
  *
  * The expression functions similarly to the ternary `?:` operator, except
  * that it is evaluated at compile-time.
@@ -978,3 +1007,50 @@ class BuiltInComplexOperation extends BuiltInOperation, @builtincomplex {
   /** Gets the operand corresponding to the imaginary part of the complex number. */
   Expr getImaginaryOperand() { this.hasChild(result, 1) }
 }
+
+/**
+ * A C++ `__is_aggregate` built-in operation (used by some implementations of the
+ * `<type_traits>` header).
+ *
+ * Returns `true` if the type has is an aggregate type.
+ * ```
+ * std::integral_constant<bool, __is_aggregate(_Tp)> ia;
+ * ```
+ */
+class BuiltInOperationIsAggregate extends BuiltInOperation, @isaggregate {
+  override string toString() { result = "__is_aggregate" }
+
+  override string getAPrimaryQlClass() { result = "BuiltInOperationIsAggregate" }
+}
+
+/**
+ * A C++ `__has_unique_object_representations` built-in operation (used by some
+ * implementations of the `<type_traits>` header).
+ *
+ * Returns `true` if the type is trivially copyable and if the object representation
+ * is unique for two objects with the same value.
+ * ```
+ * bool v = __has_unique_object_representations(MyType);
+ * ```
+ */
+class BuiltInOperationHasUniqueObjectRepresentations extends BuiltInOperation,
+  @hasuniqueobjectrepresentations {
+  override string toString() { result = "__has_unique_object_representations" }
+
+  override string getAPrimaryQlClass() { result = "BuiltInOperationHasUniqueObjectRepresentations" }
+}
+
+/**
+ * A C/C++ `__builtin_bit_cast` built-in operation (used by some implementations
+ * of `std::bit_cast`).
+ *
+ * Performs a bit cast from a value to a type.
+ * ```
+ * __builtin_bit_cast(Type, value);
+ * ```
+ */
+class BuiltInBitCast extends BuiltInOperation, @builtinbitcast {
+  override string toString() { result = "__builtin_bit_cast" }
+
+  override string getAPrimaryQlClass() { result = "BuiltInBitCast" }
+}
diff --git a/cpp/ql/lib/semmle/code/cpp/exprs/Expr.qll b/cpp/ql/lib/semmle/code/cpp/exprs/Expr.qll
index 55a59cc9588..68973293425 100644
--- a/cpp/ql/lib/semmle/code/cpp/exprs/Expr.qll
+++ b/cpp/ql/lib/semmle/code/cpp/exprs/Expr.qll
@@ -596,9 +596,12 @@ class ParenthesisExpr extends Conversion, @parexpr {
 }
 
 /**
- * A C/C++ expression that has not been resolved.
+ * A C/C++ expression that could not be resolved, or that can no longer be
+ * represented due to a database upgrade or downgrade.
  *
- * It is assigned `ErroneousType` as its type.
+ * If the expression could not be resolved, it has type `ErroneousType`. In the
+ * case of a database upgrade or downgrade, the original type from before the
+ * upgrade or downgrade is kept if that type can be represented.
  */
 class ErrorExpr extends Expr, @errorexpr {
   override string toString() { result = "<error expr>" }
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme b/cpp/ql/lib/semmlecode.cpp.dbscheme
index 19e31bf071f..23f7cbb88a4 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme
@@ -1650,6 +1650,11 @@ case @expr.kind of
 | 327 = @co_await
 | 328 = @co_yield
 | 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
 ;
 
 @var_args_expr = @vastartexpr
@@ -1711,6 +1716,11 @@ case @expr.kind of
             | @isfinalexpr
             | @builtinchooseexpr
             | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
             ;
 
 new_allocated_type(
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
index e439c5ac624..35eb9c7e6de 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
@@ -2,79 +2,79 @@
     <typesizes>
         <e>
             <k>@compilation</k>
-            <v>9980</v>
+            <v>9978</v>
         </e>
         <e>
             <k>@externalDataElement</k>
             <v>65</v>
         </e>
-        <e>
-            <k>@svnentry</k>
-            <v>575525</v>
-        </e>
         <e>
             <k>@external_package</k>
             <v>4</v>
         </e>
+        <e>
+            <k>@svnentry</k>
+            <v>575525</v>
+        </e>
         <e>
             <k>@location_stmt</k>
-            <v>3805462</v>
+            <v>3805465</v>
         </e>
         <e>
             <k>@diagnostic</k>
-            <v>582773</v>
+            <v>72312</v>
         </e>
         <e>
             <k>@file</k>
-            <v>124189</v>
+            <v>124196</v>
         </e>
         <e>
             <k>@folder</k>
             <v>15994</v>
         </e>
         <e>
-            <k>@location_expr</k>
-            <v>13128112</v>
+            <k>@location_default</k>
+            <v>30132211</v>
         </e>
         <e>
-            <k>@location_default</k>
-            <v>30128761</v>
+            <k>@location_expr</k>
+            <v>13128120</v>
         </e>
         <e>
             <k>@macroinvocation</k>
-            <v>33894981</v>
+            <v>33889080</v>
         </e>
         <e>
             <k>@function</k>
-            <v>4726273</v>
+            <v>4726519</v>
         </e>
         <e>
             <k>@fun_decl</k>
-            <v>5096962</v>
+            <v>5097227</v>
         </e>
         <e>
             <k>@type_decl</k>
-            <v>3283977</v>
+            <v>3284148</v>
         </e>
         <e>
             <k>@namespace_decl</k>
-            <v>306972</v>
+            <v>306973</v>
         </e>
         <e>
             <k>@using</k>
-            <v>374921</v>
+            <v>374941</v>
         </e>
         <e>
             <k>@static_assert</k>
-            <v>130417</v>
+            <v>130418</v>
         </e>
         <e>
             <k>@var_decl</k>
-            <v>8543232</v>
+            <v>8543677</v>
         </e>
         <e>
             <k>@parameter</k>
-            <v>6660155</v>
+            <v>6660502</v>
         </e>
         <e>
             <k>@membervariable</k>
@@ -82,7 +82,7 @@
         </e>
         <e>
             <k>@globalvariable</k>
-            <v>300708</v>
+            <v>318724</v>
         </e>
         <e>
             <k>@localvariable</k>
@@ -94,55 +94,55 @@
         </e>
         <e>
             <k>@builtintype</k>
-            <v>22109</v>
+            <v>22110</v>
         </e>
         <e>
             <k>@derivedtype</k>
-            <v>4413446</v>
+            <v>4413676</v>
         </e>
         <e>
             <k>@decltype</k>
-            <v>31047</v>
+            <v>31049</v>
         </e>
         <e>
             <k>@usertype</k>
-            <v>5342989</v>
+            <v>5343268</v>
         </e>
         <e>
             <k>@mangledname</k>
-            <v>1728010</v>
+            <v>1975901</v>
         </e>
         <e>
             <k>@type_mention</k>
-            <v>4011508</v>
+            <v>4011511</v>
         </e>
         <e>
             <k>@routinetype</k>
-            <v>546982</v>
+            <v>546661</v>
         </e>
         <e>
             <k>@ptrtomember</k>
-            <v>38103</v>
+            <v>38105</v>
         </e>
         <e>
             <k>@specifier</k>
-            <v>24932</v>
+            <v>24933</v>
         </e>
         <e>
             <k>@gnuattribute</k>
-            <v>664228</v>
+            <v>664262</v>
         </e>
         <e>
             <k>@stdattribute</k>
-            <v>468982</v>
+            <v>469081</v>
         </e>
         <e>
             <k>@alignas</k>
-            <v>8937</v>
+            <v>8938</v>
         </e>
         <e>
             <k>@declspec</k>
-            <v>238544</v>
+            <v>238545</v>
         </e>
         <e>
             <k>@msattribute</k>
@@ -150,11 +150,11 @@
         </e>
         <e>
             <k>@attribute_arg_token</k>
-            <v>25402</v>
+            <v>25403</v>
         </e>
         <e>
             <k>@attribute_arg_constant</k>
-            <v>326469</v>
+            <v>326486</v>
         </e>
         <e>
             <k>@attribute_arg_type</k>
@@ -166,15 +166,15 @@
         </e>
         <e>
             <k>@derivation</k>
-            <v>402388</v>
+            <v>402152</v>
         </e>
         <e>
             <k>@frienddecl</k>
-            <v>715075</v>
+            <v>714656</v>
         </e>
         <e>
             <k>@comment</k>
-            <v>8781270</v>
+            <v>8783134</v>
         </e>
         <e>
             <k>@namespace</k>
@@ -186,23 +186,23 @@
         </e>
         <e>
             <k>@namequalifier</k>
-            <v>1618961</v>
+            <v>1618866</v>
         </e>
         <e>
             <k>@value</k>
-            <v>10646146</v>
+            <v>10646153</v>
         </e>
         <e>
             <k>@initialiser</k>
-            <v>1731824</v>
+            <v>1732353</v>
         </e>
         <e>
             <k>@lambdacapture</k>
-            <v>28224</v>
+            <v>28226</v>
         </e>
         <e>
             <k>@stmt_expr</k>
-            <v>1480414</v>
+            <v>1480415</v>
         </e>
         <e>
             <k>@stmt_if</k>
@@ -210,23 +210,23 @@
         </e>
         <e>
             <k>@stmt_while</k>
-            <v>30207</v>
+            <v>30201</v>
         </e>
         <e>
             <k>@stmt_label</k>
-            <v>53046</v>
+            <v>53044</v>
         </e>
         <e>
             <k>@stmt_return</k>
-            <v>1306346</v>
+            <v>1306414</v>
         </e>
         <e>
             <k>@stmt_block</k>
-            <v>1446530</v>
+            <v>1446605</v>
         </e>
         <e>
             <k>@stmt_end_test_while</k>
-            <v>148604</v>
+            <v>148599</v>
         </e>
         <e>
             <k>@stmt_for</k>
@@ -234,7 +234,7 @@
         </e>
         <e>
             <k>@stmt_switch_case</k>
-            <v>191408</v>
+            <v>191399</v>
         </e>
         <e>
             <k>@stmt_switch</k>
@@ -242,11 +242,11 @@
         </e>
         <e>
             <k>@stmt_try_block</k>
-            <v>42701</v>
+            <v>42699</v>
         </e>
         <e>
             <k>@stmt_decl</k>
-            <v>608508</v>
+            <v>608387</v>
         </e>
         <e>
             <k>@stmt_empty</k>
@@ -258,7 +258,7 @@
         </e>
         <e>
             <k>@stmt_break</k>
-            <v>102231</v>
+            <v>102232</v>
         </e>
         <e>
             <k>@stmt_range_based_for</k>
@@ -266,15 +266,15 @@
         </e>
         <e>
             <k>@stmt_handler</k>
-            <v>59432</v>
+            <v>59429</v>
         </e>
         <e>
             <k>@stmt_constexpr_if</k>
-            <v>52551</v>
+            <v>52562</v>
         </e>
         <e>
             <k>@stmt_goto</k>
-            <v>110490</v>
+            <v>110487</v>
         </e>
         <e>
             <k>@stmt_asm</k>
@@ -310,43 +310,43 @@
         </e>
         <e>
             <k>@ctordirectinit</k>
-            <v>112813</v>
+            <v>112747</v>
         </e>
         <e>
             <k>@ctorvirtualinit</k>
-            <v>6534</v>
+            <v>6532</v>
         </e>
         <e>
             <k>@ctorfieldinit</k>
-            <v>200789</v>
+            <v>200671</v>
         </e>
         <e>
             <k>@ctordelegatinginit</k>
-            <v>3347</v>
+            <v>3345</v>
         </e>
         <e>
             <k>@dtordirectdestruct</k>
-            <v>41715</v>
+            <v>41690</v>
         </e>
         <e>
             <k>@dtorvirtualdestruct</k>
-            <v>4122</v>
+            <v>4119</v>
         </e>
         <e>
             <k>@dtorfielddestruct</k>
-            <v>41644</v>
+            <v>41620</v>
         </e>
         <e>
             <k>@static_cast</k>
-            <v>211821</v>
+            <v>211675</v>
         </e>
         <e>
             <k>@reinterpret_cast</k>
-            <v>30776</v>
+            <v>30783</v>
         </e>
         <e>
             <k>@const_cast</k>
-            <v>35278</v>
+            <v>35285</v>
         </e>
         <e>
             <k>@dynamic_cast</k>
@@ -354,19 +354,19 @@
         </e>
         <e>
             <k>@c_style_cast</k>
-            <v>4209393</v>
+            <v>4209396</v>
         </e>
         <e>
             <k>@lambdaexpr</k>
-            <v>21639</v>
+            <v>21640</v>
         </e>
         <e>
             <k>@param_ref</k>
-            <v>375289</v>
+            <v>375271</v>
         </e>
         <e>
             <k>@errorexpr</k>
-            <v>46823</v>
+            <v>46796</v>
         </e>
         <e>
             <k>@address_of</k>
@@ -374,27 +374,27 @@
         </e>
         <e>
             <k>@reference_to</k>
-            <v>1596143</v>
+            <v>1596067</v>
         </e>
         <e>
             <k>@indirect</k>
-            <v>292115</v>
+            <v>292106</v>
         </e>
         <e>
             <k>@ref_indirect</k>
-            <v>1934537</v>
+            <v>1938685</v>
         </e>
         <e>
             <k>@array_to_pointer</k>
-            <v>1424883</v>
+            <v>1424884</v>
         </e>
         <e>
             <k>@vacuous_destructor_call</k>
-            <v>8138</v>
+            <v>8133</v>
         </e>
         <e>
             <k>@parexpr</k>
-            <v>3572547</v>
+            <v>3572549</v>
         </e>
         <e>
             <k>@arithnegexpr</k>
@@ -402,11 +402,11 @@
         </e>
         <e>
             <k>@complementexpr</k>
-            <v>27787</v>
+            <v>27786</v>
         </e>
         <e>
             <k>@notexpr</k>
-            <v>277992</v>
+            <v>277993</v>
         </e>
         <e>
             <k>@postincrexpr</k>
@@ -446,11 +446,11 @@
         </e>
         <e>
             <k>@remexpr</k>
-            <v>15819</v>
+            <v>15810</v>
         </e>
         <e>
             <k>@paddexpr</k>
-            <v>86505</v>
+            <v>86502</v>
         </e>
         <e>
             <k>@psubexpr</k>
@@ -458,7 +458,7 @@
         </e>
         <e>
             <k>@pdiffexpr</k>
-            <v>35487</v>
+            <v>35495</v>
         </e>
         <e>
             <k>@lshiftexpr</k>
@@ -490,11 +490,11 @@
         </e>
         <e>
             <k>@gtexpr</k>
-            <v>100669</v>
+            <v>100674</v>
         </e>
         <e>
             <k>@ltexpr</k>
-            <v>106314</v>
+            <v>106319</v>
         </e>
         <e>
             <k>@geexpr</k>
@@ -502,11 +502,11 @@
         </e>
         <e>
             <k>@leexpr</k>
-            <v>212141</v>
+            <v>212134</v>
         </e>
         <e>
             <k>@assignexpr</k>
-            <v>933419</v>
+            <v>933420</v>
         </e>
         <e>
             <k>@assignaddexpr</k>
@@ -518,7 +518,7 @@
         </e>
         <e>
             <k>@assignmulexpr</k>
-            <v>7170</v>
+            <v>7168</v>
         </e>
         <e>
             <k>@assigndivexpr</k>
@@ -546,7 +546,7 @@
         </e>
         <e>
             <k>@assignxorexpr</k>
-            <v>21804</v>
+            <v>21803</v>
         </e>
         <e>
             <k>@assignpaddexpr</k>
@@ -554,7 +554,7 @@
         </e>
         <e>
             <k>@andlogicalexpr</k>
-            <v>249008</v>
+            <v>249009</v>
         </e>
         <e>
             <k>@orlogicalexpr</k>
@@ -562,7 +562,7 @@
         </e>
         <e>
             <k>@commaexpr</k>
-            <v>181539</v>
+            <v>181530</v>
         </e>
         <e>
             <k>@subscriptexpr</k>
@@ -570,7 +570,7 @@
         </e>
         <e>
             <k>@callexpr</k>
-            <v>309063</v>
+            <v>309079</v>
         </e>
         <e>
             <k>@vastartexpr</k>
@@ -586,27 +586,27 @@
         </e>
         <e>
             <k>@varaccess</k>
-            <v>6006364</v>
+            <v>6006368</v>
         </e>
         <e>
             <k>@thisaccess</k>
-            <v>1125914</v>
+            <v>1125919</v>
         </e>
         <e>
             <k>@new_expr</k>
-            <v>47598</v>
+            <v>47571</v>
         </e>
         <e>
             <k>@delete_expr</k>
-            <v>11732</v>
+            <v>11725</v>
         </e>
         <e>
             <k>@throw_expr</k>
-            <v>21765</v>
+            <v>21760</v>
         </e>
         <e>
             <k>@condition_decl</k>
-            <v>38595</v>
+            <v>38593</v>
         </e>
         <e>
             <k>@braced_init_list</k>
@@ -614,7 +614,7 @@
         </e>
         <e>
             <k>@type_id</k>
-            <v>36430</v>
+            <v>36408</v>
         </e>
         <e>
             <k>@runtime_sizeof</k>
@@ -622,15 +622,15 @@
         </e>
         <e>
             <k>@runtime_alignof</k>
-            <v>48550</v>
+            <v>48521</v>
         </e>
         <e>
             <k>@sizeof_pack</k>
-            <v>5644</v>
+            <v>5645</v>
         </e>
         <e>
             <k>@routineexpr</k>
-            <v>3047613</v>
+            <v>3047738</v>
         </e>
         <e>
             <k>@type_operand</k>
@@ -642,7 +642,7 @@
         </e>
         <e>
             <k>@ispodexpr</k>
-            <v>636</v>
+            <v>635</v>
         </e>
         <e>
             <k>@hastrivialdestructor</k>
@@ -666,23 +666,23 @@
         </e>
         <e>
             <k>@isconstructibleexpr</k>
-            <v>2721</v>
+            <v>2722</v>
         </e>
         <e>
             <k>@isfinalexpr</k>
-            <v>2093</v>
+            <v>2094</v>
         </e>
         <e>
             <k>@noexceptexpr</k>
-            <v>23574</v>
+            <v>23573</v>
         </e>
         <e>
             <k>@builtinaddressof</k>
-            <v>13282</v>
+            <v>13274</v>
         </e>
         <e>
             <k>@temp_init</k>
-            <v>760683</v>
+            <v>760646</v>
         </e>
         <e>
             <k>@assume</k>
@@ -826,7 +826,7 @@
         </e>
         <e>
             <k>@typescompexpr</k>
-            <v>562415</v>
+            <v>562416</v>
         </e>
         <e>
             <k>@intaddrexpr</k>
@@ -846,7 +846,7 @@
         </e>
         <e>
             <k>@istriviallyconstructibleexpr</k>
-            <v>2826</v>
+            <v>2827</v>
         </e>
         <e>
             <k>@isdestructibleexpr</k>
@@ -866,7 +866,7 @@
         </e>
         <e>
             <k>@isnothrowassignableexpr</k>
-            <v>2093</v>
+            <v>2094</v>
         </e>
         <e>
             <k>@isstandardlayoutexpr</k>
@@ -890,7 +890,7 @@
         </e>
         <e>
             <k>@isnothrowconstructibleexpr</k>
-            <v>4815</v>
+            <v>4816</v>
         </e>
         <e>
             <k>@hasfinalizerexpr</k>
@@ -956,45 +956,65 @@
             <k>@co_yield</k>
             <v>1</v>
         </e>
+        <e>
+            <k>@isassignable</k>
+            <v>2617</v>
+        </e>
+        <e>
+            <k>@isaggregate</k>
+            <v>2</v>
+        </e>
+        <e>
+            <k>@hasuniqueobjectrepresentations</k>
+            <v>2</v>
+        </e>
+        <e>
+            <k>@builtinbitcast</k>
+            <v>1</v>
+        </e>
+        <e>
+            <k>@builtinshuffle</k>
+            <v>1965</v>
+        </e>
         <e>
             <k>@ppd_if</k>
-            <v>672225</v>
+            <v>672260</v>
         </e>
         <e>
             <k>@ppd_ifdef</k>
-            <v>265314</v>
+            <v>265328</v>
         </e>
         <e>
             <k>@ppd_ifndef</k>
-            <v>268607</v>
+            <v>268621</v>
         </e>
         <e>
             <k>@ppd_elif</k>
-            <v>25402</v>
+            <v>25403</v>
         </e>
         <e>
             <k>@ppd_else</k>
-            <v>210746</v>
+            <v>210757</v>
         </e>
         <e>
             <k>@ppd_endif</k>
-            <v>1206147</v>
+            <v>1206210</v>
         </e>
         <e>
             <k>@ppd_plain_include</k>
-            <v>313767</v>
+            <v>313784</v>
         </e>
         <e>
             <k>@ppd_define</k>
-            <v>2435252</v>
+            <v>2435769</v>
         </e>
         <e>
             <k>@ppd_undef</k>
-            <v>262021</v>
+            <v>262035</v>
         </e>
         <e>
             <k>@ppd_pragma</k>
-            <v>312270</v>
+            <v>312337</v>
         </e>
         <e>
             <k>@ppd_include_next</k>
@@ -1048,11 +1068,11 @@
     <stats>
         <relation>
             <name>compilations</name>
-            <cardinality>9980</cardinality>
+            <cardinality>9978</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9980</v>
+                    <v>9978</v>
                 </e>
                 <e>
                     <k>cwd</k>
@@ -1070,7 +1090,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9980</v>
+                                    <v>9978</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1644,7 +1664,7 @@
                 </e>
                 <e>
                     <k>seconds</k>
-                    <v>12490</v>
+                    <v>9586</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -1725,48 +1745,48 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>198</v>
+                                    <v>715</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>795</v>
+                                    <v>278</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>9</b>
+                                    <a>6</a>
+                                    <b>8</b>
                                     <v>159</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
+                                    <a>8</a>
+                                    <b>10</b>
+                                    <v>159</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
                                     <b>11</b>
-                                    <v>119</v>
+                                    <v>79</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>12</b>
-                                    <v>198</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>18</b>
                                     <v>159</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>22</b>
+                                    <a>17</a>
+                                    <b>19</b>
+                                    <v>159</v>
+                                </b>
+                                <b>
+                                    <a>20</a>
+                                    <b>27</b>
+                                    <v>159</v>
+                                </b>
+                                <b>
+                                    <a>40</a>
+                                    <b>77</b>
                                     <v>119</v>
                                 </b>
-                                <b>
-                                    <a>22</a>
-                                    <b>46</b>
-                                    <v>159</v>
-                                </b>
-                                <b>
-                                    <a>60</a>
-                                    <b>104</b>
-                                    <v>79</v>
-                                </b>
                             </bs>
                         </hist>
                     </val>
@@ -1833,12 +1853,12 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>556</v>
+                                    <v>835</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1233</v>
+                                    <v>914</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -1848,32 +1868,27 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>119</v>
+                                    <v>437</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>318</v>
+                                    <v>79</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>119</v>
+                                    <v>278</v>
                                 </b>
                                 <b>
                                     <a>9</a>
-                                    <b>11</b>
+                                    <b>26</b>
                                     <v>278</v>
                                 </b>
                                 <b>
-                                    <a>11</a>
-                                    <b>31</b>
-                                    <v>278</v>
-                                </b>
-                                <b>
-                                    <a>40</a>
-                                    <b>95</b>
-                                    <v>159</v>
+                                    <a>26</a>
+                                    <b>92</b>
+                                    <v>238</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1919,18 +1934,23 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>79</v>
-                                </b>
-                                <b>
-                                    <a>152</a>
-                                    <b>153</b>
+                                    <a>3</a>
+                                    <b>4</b>
                                     <v>39</v>
                                 </b>
                                 <b>
-                                    <a>160</a>
-                                    <b>161</b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>39</v>
+                                </b>
+                                <b>
+                                    <a>112</a>
+                                    <b>113</b>
+                                    <v>39</v>
+                                </b>
+                                <b>
+                                    <a>129</a>
+                                    <b>130</b>
                                     <v>39</v>
                                 </b>
                             </bs>
@@ -1947,22 +1967,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7875</v>
+                                    <v>5449</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2704</v>
+                                    <v>1670</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1312</v>
+                                    <v>1272</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>45</b>
-                                    <v>596</v>
+                                    <b>5</b>
+                                    <v>676</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>42</b>
+                                    <v>517</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1978,27 +2003,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6682</v>
+                                    <v>5091</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3142</v>
+                                    <v>1392</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1431</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>6</b>
                                     <v>954</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>65</b>
-                                    <v>278</v>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>875</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>7</b>
+                                    <v>795</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>67</b>
+                                    <v>477</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2014,12 +2044,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12251</v>
+                                    <v>9307</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>238</v>
+                                    <v>278</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2029,23 +2059,23 @@
         </relation>
         <relation>
             <name>diagnostic_for</name>
-            <cardinality>1031027</cardinality>
+            <cardinality>891808</cardinality>
             <columnsizes>
                 <e>
                     <k>diagnostic</k>
-                    <v>582773</v>
+                    <v>72312</v>
                 </e>
                 <e>
                     <k>compilation</k>
-                    <v>1988</v>
+                    <v>9585</v>
                 </e>
                 <e>
                     <k>file_number</k>
-                    <v>104</v>
+                    <v>11</v>
                 </e>
                 <e>
                     <k>file_number_diagnostic_number</k>
-                    <v>104788</v>
+                    <v>6856</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2059,27 +2089,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>362937</v>
+                                    <v>9631</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>92540</v>
+                                    <v>59836</v>
                                 </b>
                                 <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>70033</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>47421</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>9</b>
-                                    <v>9840</v>
+                                    <a>254</a>
+                                    <b>825</b>
+                                    <v>2844</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2095,7 +2115,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>582773</v>
+                                    <v>72312</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2111,22 +2131,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>475263</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>50143</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>6</b>
-                                    <v>53702</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>3663</v>
+                                    <v>72312</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2135,222 +2140,6 @@
                 <dep>
                     <src>compilation</src>
                     <trg>diagnostic</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>32</a>
-                                    <b>33</b>
-                                    <v>104</v>
-                                </b>
-                                <b>
-                                    <a>37</a>
-                                    <b>38</b>
-                                    <v>104</v>
-                                </b>
-                                <b>
-                                    <a>77</a>
-                                    <b>78</b>
-                                    <v>104</v>
-                                </b>
-                                <b>
-                                    <a>78</a>
-                                    <b>79</b>
-                                    <v>104</v>
-                                </b>
-                                <b>
-                                    <a>155</a>
-                                    <b>156</b>
-                                    <v>104</v>
-                                </b>
-                                <b>
-                                    <a>359</a>
-                                    <b>360</b>
-                                    <v>104</v>
-                                </b>
-                                <b>
-                                    <a>418</a>
-                                    <b>419</b>
-                                    <v>104</v>
-                                </b>
-                                <b>
-                                    <a>436</a>
-                                    <b>437</b>
-                                    <v>104</v>
-                                </b>
-                                <b>
-                                    <a>509</a>
-                                    <b>510</b>
-                                    <v>104</v>
-                                </b>
-                                <b>
-                                    <a>571</a>
-                                    <b>572</b>
-                                    <v>104</v>
-                                </b>
-                                <b>
-                                    <a>639</a>
-                                    <b>640</b>
-                                    <v>104</v>
-                                </b>
-                                <b>
-                                    <a>756</a>
-                                    <b>757</b>
-                                    <v>628</v>
-                                </b>
-                                <b>
-                                    <a>1001</a>
-                                    <b>1002</b>
-                                    <v>209</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>compilation</src>
-                    <trg>file_number</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1988</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>compilation</src>
-                    <trg>file_number_diagnostic_number</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>32</a>
-                                    <b>33</b>
-                                    <v>104</v>
-                                </b>
-                                <b>
-                                    <a>37</a>
-                                    <b>38</b>
-                                    <v>104</v>
-                                </b>
-                                <b>
-                                    <a>77</a>
-                                    <b>78</b>
-                                    <v>104</v>
-                                </b>
-                                <b>
-                                    <a>78</a>
-                                    <b>79</b>
-                                    <v>104</v>
-                                </b>
-                                <b>
-                                    <a>155</a>
-                                    <b>156</b>
-                                    <v>104</v>
-                                </b>
-                                <b>
-                                    <a>359</a>
-                                    <b>360</b>
-                                    <v>104</v>
-                                </b>
-                                <b>
-                                    <a>418</a>
-                                    <b>419</b>
-                                    <v>104</v>
-                                </b>
-                                <b>
-                                    <a>436</a>
-                                    <b>437</b>
-                                    <v>104</v>
-                                </b>
-                                <b>
-                                    <a>509</a>
-                                    <b>510</b>
-                                    <v>104</v>
-                                </b>
-                                <b>
-                                    <a>571</a>
-                                    <b>572</b>
-                                    <v>104</v>
-                                </b>
-                                <b>
-                                    <a>639</a>
-                                    <b>640</b>
-                                    <v>104</v>
-                                </b>
-                                <b>
-                                    <a>756</a>
-                                    <b>757</b>
-                                    <v>628</v>
-                                </b>
-                                <b>
-                                    <a>1001</a>
-                                    <b>1002</b>
-                                    <v>209</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>file_number</src>
-                    <trg>diagnostic</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>5567</a>
-                                    <b>5568</b>
-                                    <v>104</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>file_number</src>
-                    <trg>compilation</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>19</a>
-                                    <b>20</b>
-                                    <v>104</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>file_number</src>
-                    <trg>file_number_diagnostic_number</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1001</a>
-                                    <b>1002</b>
-                                    <v>104</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>file_number_diagnostic_number</src>
-                    <trg>diagnostic</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -2358,37 +2147,193 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>25647</v>
+                                    <v>57</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>10991</v>
+                                    <v>6093</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>13085</v>
+                                    <v>497</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
-                                    <b>10</b>
-                                    <v>13608</v>
+                                    <a>247</a>
+                                    <b>248</b>
+                                    <v>1965</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>27741</v>
+                                    <a>263</a>
+                                    <b>444</b>
+                                    <v>763</v>
                                 </b>
                                 <b>
-                                    <a>11</a>
-                                    <b>12</b>
-                                    <v>5652</v>
+                                    <a>446</a>
+                                    <b>594</b>
+                                    <v>208</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>compilation</src>
+                    <trg>file_number</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>9585</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>compilation</src>
+                    <trg>file_number_diagnostic_number</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>57</v>
                                 </b>
                                 <b>
-                                    <a>12</a>
-                                    <b>15</b>
-                                    <v>8060</v>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>6093</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>497</v>
+                                </b>
+                                <b>
+                                    <a>247</a>
+                                    <b>248</b>
+                                    <v>1965</v>
+                                </b>
+                                <b>
+                                    <a>263</a>
+                                    <b>444</b>
+                                    <v>763</v>
+                                </b>
+                                <b>
+                                    <a>446</a>
+                                    <b>594</b>
+                                    <v>208</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>file_number</src>
+                    <trg>diagnostic</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>6254</a>
+                                    <b>6255</b>
+                                    <v>11</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>file_number</src>
+                    <trg>compilation</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>829</a>
+                                    <b>830</b>
+                                    <v>11</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>file_number</src>
+                    <trg>file_number_diagnostic_number</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>593</a>
+                                    <b>594</b>
+                                    <v>11</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>file_number_diagnostic_number</src>
+                    <trg>diagnostic</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2821</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>5</b>
+                                    <v>601</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>1017</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>14</b>
+                                    <v>543</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>16</b>
+                                    <v>57</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>18</b>
+                                    <v>601</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>23</b>
+                                    <v>462</v>
+                                </b>
+                                <b>
+                                    <a>26</a>
+                                    <b>40</b>
+                                    <v>555</v>
+                                </b>
+                                <b>
+                                    <a>42</a>
+                                    <b>830</b>
+                                    <v>196</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2402,49 +2347,54 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>25647</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
+                                    <a>4</a>
                                     <b>9</b>
-                                    <v>12247</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>10</b>
-                                    <v>7118</v>
+                                    <v>589</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>6490</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>13</b>
-                                    <v>9526</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>14</b>
-                                    <v>6176</v>
+                                    <v>1005</v>
                                 </b>
                                 <b>
                                     <a>14</a>
-                                    <b>15</b>
-                                    <v>21355</v>
+                                    <b>27</b>
+                                    <v>543</v>
                                 </b>
                                 <b>
-                                    <a>15</a>
-                                    <b>16</b>
-                                    <v>8060</v>
+                                    <a>30</a>
+                                    <b>31</b>
+                                    <v>57</v>
                                 </b>
                                 <b>
-                                    <a>16</a>
-                                    <b>20</b>
-                                    <v>8165</v>
+                                    <a>34</a>
+                                    <b>35</b>
+                                    <v>601</v>
+                                </b>
+                                <b>
+                                    <a>36</a>
+                                    <b>45</b>
+                                    <v>462</v>
+                                </b>
+                                <b>
+                                    <a>52</a>
+                                    <b>79</b>
+                                    <v>555</v>
+                                </b>
+                                <b>
+                                    <a>84</a>
+                                    <b>85</b>
+                                    <v>185</v>
+                                </b>
+                                <b>
+                                    <a>254</a>
+                                    <b>255</b>
+                                    <v>2763</v>
+                                </b>
+                                <b>
+                                    <a>297</a>
+                                    <b>830</b>
+                                    <v>92</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2460,7 +2410,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>104788</v>
+                                    <v>6856</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2470,19 +2420,19 @@
         </relation>
         <relation>
             <name>compilation_finished</name>
-            <cardinality>9980</cardinality>
+            <cardinality>9978</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9980</v>
+                    <v>9978</v>
                 </e>
                 <e>
                     <k>cpu_seconds</k>
-                    <v>7956</v>
+                    <v>7850</v>
                 </e>
                 <e>
                     <k>elapsed_seconds</k>
-                    <v>138</v>
+                    <v>161</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2496,7 +2446,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9980</v>
+                                    <v>9978</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2512,7 +2462,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9980</v>
+                                    <v>9978</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2528,17 +2478,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6777</v>
+                                    <v>6498</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>786</v>
+                                    <v>1005</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>17</b>
-                                    <v>393</v>
+                                    <b>15</b>
+                                    <v>346</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2554,12 +2504,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7505</v>
+                                    <v>7423</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>451</v>
+                                    <v>427</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2572,10 +2522,15 @@
                         <hist>
                             <budget>12</budget>
                             <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>23</v>
+                                </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>23</v>
+                                    <v>11</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -2583,43 +2538,43 @@
                                     <v>23</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
-                                    <b>10</b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>23</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>14</a>
-                                    <b>15</b>
+                                    <a>24</a>
+                                    <b>25</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>22</a>
-                                    <b>23</b>
+                                    <a>49</a>
+                                    <b>50</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>37</a>
-                                    <b>38</b>
+                                    <a>104</a>
+                                    <b>105</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>144</a>
-                                    <b>145</b>
+                                    <a>155</a>
+                                    <b>156</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>162</a>
-                                    <b>163</b>
+                                    <a>239</a>
+                                    <b>240</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>222</a>
-                                    <b>223</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>243</a>
-                                    <b>244</b>
+                                    <a>255</a>
+                                    <b>256</b>
                                     <v>11</v>
                                 </b>
                             </bs>
@@ -2633,10 +2588,15 @@
                         <hist>
                             <budget>12</budget>
                             <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>23</v>
+                                </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>23</v>
+                                    <v>11</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -2644,43 +2604,43 @@
                                     <v>23</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
-                                    <b>10</b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>23</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>14</a>
-                                    <b>15</b>
+                                    <a>24</a>
+                                    <b>25</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>22</a>
-                                    <b>23</b>
+                                    <a>49</a>
+                                    <b>50</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>36</a>
-                                    <b>37</b>
+                                    <a>104</a>
+                                    <b>105</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>118</a>
-                                    <b>119</b>
+                                    <a>111</a>
+                                    <b>112</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>123</a>
-                                    <b>124</b>
+                                    <a>174</a>
+                                    <b>175</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>177</a>
-                                    <b>178</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>218</a>
-                                    <b>219</b>
+                                    <a>217</a>
+                                    <b>218</b>
                                     <v>11</v>
                                 </b>
                             </bs>
@@ -4405,31 +4365,31 @@
         </relation>
         <relation>
             <name>locations_default</name>
-            <cardinality>30128761</cardinality>
+            <cardinality>30132211</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>30128761</v>
+                    <v>30132211</v>
                 </e>
                 <e>
                     <k>container</k>
-                    <v>140184</v>
+                    <v>140191</v>
                 </e>
                 <e>
                     <k>startLine</k>
-                    <v>2114992</v>
+                    <v>2115102</v>
                 </e>
                 <e>
                     <k>startColumn</k>
-                    <v>37162</v>
+                    <v>37164</v>
                 </e>
                 <e>
                     <k>endLine</k>
-                    <v>2117814</v>
+                    <v>2117925</v>
                 </e>
                 <e>
                     <k>endColumn</k>
-                    <v>48452</v>
+                    <v>48455</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -4443,7 +4403,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30128761</v>
+                                    <v>30132211</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4459,7 +4419,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30128761</v>
+                                    <v>30132211</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4475,7 +4435,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30128761</v>
+                                    <v>30132211</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4491,7 +4451,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30128761</v>
+                                    <v>30132211</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4507,7 +4467,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30128761</v>
+                                    <v>30132211</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4523,67 +4483,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16464</v>
+                                    <v>16465</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>12</b>
-                                    <v>10819</v>
+                                    <v>10820</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>20</b>
-                                    <v>11760</v>
+                                    <v>11761</v>
                                 </b>
                                 <b>
                                     <a>21</a>
                                     <b>36</b>
-                                    <v>11289</v>
+                                    <v>11290</v>
                                 </b>
                                 <b>
                                     <a>36</a>
                                     <b>55</b>
-                                    <v>11289</v>
+                                    <v>11290</v>
                                 </b>
                                 <b>
                                     <a>55</a>
                                     <b>77</b>
-                                    <v>10819</v>
+                                    <v>10820</v>
                                 </b>
                                 <b>
                                     <a>77</a>
                                     <b>102</b>
-                                    <v>10819</v>
+                                    <v>10820</v>
                                 </b>
                                 <b>
                                     <a>102</a>
                                     <b>149</b>
-                                    <v>10819</v>
+                                    <v>10820</v>
                                 </b>
                                 <b>
                                     <a>149</a>
                                     <b>227</b>
-                                    <v>11289</v>
+                                    <v>11290</v>
                                 </b>
                                 <b>
                                     <a>228</a>
                                     <b>350</b>
-                                    <v>11289</v>
+                                    <v>10820</v>
                                 </b>
                                 <b>
-                                    <a>358</a>
-                                    <b>628</b>
-                                    <v>10819</v>
+                                    <a>351</a>
+                                    <b>604</b>
+                                    <v>10820</v>
                                 </b>
                                 <b>
-                                    <a>671</a>
-                                    <b>1926</b>
-                                    <v>10819</v>
+                                    <a>627</a>
+                                    <b>1479</b>
+                                    <v>10820</v>
                                 </b>
                                 <b>
-                                    <a>2168</a>
+                                    <a>1925</a>
                                     <b>2380</b>
-                                    <v>1881</v>
+                                    <v>2352</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4599,62 +4559,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16464</v>
+                                    <v>16465</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>9</b>
-                                    <v>10819</v>
+                                    <v>10820</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>16</b>
-                                    <v>11760</v>
+                                    <v>11761</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>25</b>
-                                    <v>11289</v>
+                                    <v>11290</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>40</b>
-                                    <v>10819</v>
+                                    <v>10820</v>
                                 </b>
                                 <b>
                                     <a>40</a>
                                     <b>57</b>
-                                    <v>10819</v>
+                                    <v>10820</v>
                                 </b>
                                 <b>
                                     <a>58</a>
                                     <b>72</b>
-                                    <v>10819</v>
+                                    <v>10820</v>
                                 </b>
                                 <b>
                                     <a>73</a>
                                     <b>103</b>
-                                    <v>11289</v>
+                                    <v>11290</v>
                                 </b>
                                 <b>
                                     <a>106</a>
                                     <b>141</b>
-                                    <v>11760</v>
+                                    <v>11761</v>
                                 </b>
                                 <b>
                                     <a>148</a>
                                     <b>226</b>
-                                    <v>11289</v>
+                                    <v>11290</v>
                                 </b>
                                 <b>
                                     <a>226</a>
                                     <b>373</b>
-                                    <v>10819</v>
+                                    <v>10820</v>
                                 </b>
                                 <b>
                                     <a>381</a>
                                     <b>1456</b>
-                                    <v>10819</v>
+                                    <v>10820</v>
                                 </b>
                                 <b>
                                     <a>1464</a>
@@ -4675,62 +4635,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16464</v>
+                                    <v>16465</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>8937</v>
+                                    <v>8938</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>7526</v>
+                                    <v>7527</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>7526</v>
+                                    <v>7527</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>11760</v>
+                                    <v>11761</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>13</b>
-                                    <v>12230</v>
+                                    <v>12231</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>17</b>
-                                    <v>10819</v>
+                                    <v>10820</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>25</b>
-                                    <v>11289</v>
+                                    <v>11290</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>31</b>
-                                    <v>11760</v>
+                                    <v>11761</v>
                                 </b>
                                 <b>
                                     <a>31</a>
                                     <b>38</b>
-                                    <v>10819</v>
+                                    <v>10820</v>
                                 </b>
                                 <b>
                                     <a>38</a>
                                     <b>52</b>
-                                    <v>10819</v>
+                                    <v>10820</v>
                                 </b>
                                 <b>
                                     <a>52</a>
                                     <b>64</b>
-                                    <v>10819</v>
+                                    <v>10820</v>
                                 </b>
                                 <b>
                                     <a>65</a>
@@ -4751,62 +4711,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16464</v>
+                                    <v>16465</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>9</b>
-                                    <v>10819</v>
+                                    <v>10820</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>16</b>
-                                    <v>11760</v>
+                                    <v>11761</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>25</b>
-                                    <v>11289</v>
+                                    <v>11290</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>40</b>
-                                    <v>10819</v>
+                                    <v>10820</v>
                                 </b>
                                 <b>
                                     <a>40</a>
                                     <b>57</b>
-                                    <v>10819</v>
+                                    <v>10820</v>
                                 </b>
                                 <b>
                                     <a>58</a>
                                     <b>71</b>
-                                    <v>10819</v>
+                                    <v>10820</v>
                                 </b>
                                 <b>
                                     <a>72</a>
                                     <b>98</b>
-                                    <v>10819</v>
+                                    <v>10820</v>
                                 </b>
                                 <b>
                                     <a>101</a>
                                     <b>140</b>
-                                    <v>11760</v>
+                                    <v>11761</v>
                                 </b>
                                 <b>
                                     <a>140</a>
                                     <b>224</b>
-                                    <v>10819</v>
+                                    <v>10820</v>
                                 </b>
                                 <b>
                                     <a>224</a>
                                     <b>360</b>
-                                    <v>10819</v>
+                                    <v>10820</v>
                                 </b>
                                 <b>
                                     <a>364</a>
                                     <b>1185</b>
-                                    <v>10819</v>
+                                    <v>10820</v>
                                 </b>
                                 <b>
                                     <a>1254</a>
@@ -4827,27 +4787,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16464</v>
+                                    <v>16465</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>11289</v>
+                                    <v>11290</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>14</b>
-                                    <v>10819</v>
+                                    <v>10820</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>21</b>
-                                    <v>11289</v>
+                                    <v>11290</v>
                                 </b>
                                 <b>
                                     <a>22</a>
                                     <b>31</b>
-                                    <v>11289</v>
+                                    <v>11290</v>
                                 </b>
                                 <b>
                                     <a>31</a>
@@ -4857,27 +4817,27 @@
                                 <b>
                                     <a>39</a>
                                     <b>48</b>
-                                    <v>12230</v>
+                                    <v>12231</v>
                                 </b>
                                 <b>
                                     <a>48</a>
                                     <b>56</b>
-                                    <v>11760</v>
+                                    <v>11761</v>
                                 </b>
                                 <b>
                                     <a>56</a>
                                     <b>64</b>
-                                    <v>11760</v>
+                                    <v>11761</v>
                                 </b>
                                 <b>
                                     <a>64</a>
                                     <b>72</b>
-                                    <v>10819</v>
+                                    <v>10820</v>
                                 </b>
                                 <b>
                                     <a>72</a>
                                     <b>77</b>
-                                    <v>11289</v>
+                                    <v>11290</v>
                                 </b>
                                 <b>
                                     <a>77</a>
@@ -4898,47 +4858,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>581905</v>
+                                    <v>581935</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>318001</v>
+                                    <v>318018</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>199456</v>
+                                    <v>199466</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>160882</v>
+                                    <v>160890</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>190048</v>
+                                    <v>190058</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>16</b>
-                                    <v>166057</v>
+                                    <v>166065</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>25</b>
-                                    <v>168879</v>
+                                    <v>168888</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>46</b>
-                                    <v>163704</v>
+                                    <v>163713</v>
                                 </b>
                                 <b>
                                     <a>46</a>
                                     <b>169</b>
-                                    <v>159000</v>
+                                    <v>159009</v>
                                 </b>
                                 <b>
                                     <a>170</a>
@@ -4959,42 +4919,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>869799</v>
+                                    <v>869845</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>280838</v>
+                                    <v>280853</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>191459</v>
+                                    <v>191469</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>181110</v>
+                                    <v>181119</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>12</b>
-                                    <v>162293</v>
+                                    <v>162302</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>18</b>
-                                    <v>166527</v>
+                                    <v>166536</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>39</b>
-                                    <v>159941</v>
+                                    <v>159949</v>
                                 </b>
                                 <b>
                                     <a>39</a>
                                     <b>299</b>
-                                    <v>103021</v>
+                                    <v>103026</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5010,47 +4970,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>612482</v>
+                                    <v>612514</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>313297</v>
+                                    <v>313313</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>202749</v>
+                                    <v>202760</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>184403</v>
+                                    <v>184412</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>180639</v>
+                                    <v>180649</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>13</b>
-                                    <v>166997</v>
+                                    <v>167006</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>19</b>
-                                    <v>173583</v>
+                                    <v>173592</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>29</b>
-                                    <v>167468</v>
+                                    <v>167476</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>52</b>
-                                    <v>113370</v>
+                                    <v>113376</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5066,22 +5026,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1545788</v>
+                                    <v>1545868</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>351401</v>
+                                    <v>351419</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>164645</v>
+                                    <v>164654</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>16</b>
-                                    <v>53157</v>
+                                    <v>53159</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5097,47 +5057,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>586609</v>
+                                    <v>586639</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>318942</v>
+                                    <v>318958</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>201808</v>
+                                    <v>201819</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>167468</v>
+                                    <v>167476</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>160412</v>
+                                    <v>160420</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>14</b>
-                                    <v>178287</v>
+                                    <v>178297</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>21</b>
-                                    <v>176406</v>
+                                    <v>176415</v>
                                 </b>
                                 <b>
                                     <a>21</a>
                                     <b>32</b>
-                                    <v>163234</v>
+                                    <v>163243</v>
                                 </b>
                                 <b>
                                     <a>32</a>
                                     <b>61</b>
-                                    <v>159000</v>
+                                    <v>159009</v>
                                 </b>
                                 <b>
                                     <a>61</a>
@@ -5212,7 +5172,7 @@
                                 </b>
                                 <b>
                                     <a>819</a>
-                                    <b>1546</b>
+                                    <b>1548</b>
                                     <v>2822</v>
                                 </b>
                                 <b>
@@ -5244,7 +5204,7 @@
                                 <b>
                                     <a>23</a>
                                     <b>35</b>
-                                    <v>3292</v>
+                                    <v>3293</v>
                                 </b>
                                 <b>
                                     <a>38</a>
@@ -5263,23 +5223,23 @@
                                 </b>
                                 <b>
                                     <a>73</a>
-                                    <b>83</b>
-                                    <v>2822</v>
+                                    <b>84</b>
+                                    <v>3293</v>
                                 </b>
                                 <b>
-                                    <a>83</a>
-                                    <b>95</b>
-                                    <v>2822</v>
+                                    <a>84</a>
+                                    <b>97</b>
+                                    <v>3293</v>
                                 </b>
                                 <b>
-                                    <a>96</a>
+                                    <a>98</a>
                                     <b>101</b>
-                                    <v>3292</v>
+                                    <v>2352</v>
                                 </b>
                                 <b>
                                     <a>101</a>
                                     <b>105</b>
-                                    <v>3292</v>
+                                    <v>3293</v>
                                 </b>
                                 <b>
                                     <a>106</a>
@@ -5369,7 +5329,7 @@
                                 </b>
                                 <b>
                                     <a>587</a>
-                                    <b>831</b>
+                                    <b>832</b>
                                     <v>2822</v>
                                 </b>
                                 <b>
@@ -5482,12 +5442,12 @@
                                 <b>
                                     <a>7</a>
                                     <b>11</b>
-                                    <v>3292</v>
+                                    <v>3293</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>16</b>
-                                    <v>3292</v>
+                                    <v>3293</v>
                                 </b>
                                 <b>
                                     <a>16</a>
@@ -5502,7 +5462,7 @@
                                 <b>
                                     <a>24</a>
                                     <b>27</b>
-                                    <v>3292</v>
+                                    <v>3293</v>
                                 </b>
                                 <b>
                                     <a>28</a>
@@ -5512,7 +5472,7 @@
                                 <b>
                                     <a>33</a>
                                     <b>40</b>
-                                    <v>3292</v>
+                                    <v>3293</v>
                                 </b>
                                 <b>
                                     <a>40</a>
@@ -5553,52 +5513,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>589902</v>
+                                    <v>589932</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>312356</v>
+                                    <v>312372</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>198986</v>
+                                    <v>198996</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>161352</v>
+                                    <v>161361</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>189577</v>
+                                    <v>189587</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>16</b>
-                                    <v>163704</v>
+                                    <v>163713</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>25</b>
-                                    <v>171231</v>
+                                    <v>170770</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>45</b>
-                                    <v>159471</v>
+                                    <v>159949</v>
                                 </b>
                                 <b>
                                     <a>45</a>
                                     <b>160</b>
-                                    <v>159941</v>
+                                    <v>159949</v>
                                 </b>
                                 <b>
                                     <a>160</a>
                                     <b>299</b>
-                                    <v>11289</v>
+                                    <v>11290</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5614,47 +5574,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>881560</v>
+                                    <v>881606</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>270019</v>
+                                    <v>270033</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>123249</v>
+                                    <v>123255</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>142065</v>
+                                    <v>142073</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>195693</v>
+                                    <v>195703</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>15</b>
-                                    <v>168409</v>
+                                    <v>168417</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>26</b>
-                                    <v>165586</v>
+                                    <v>165595</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>120</b>
-                                    <v>159471</v>
+                                    <v>159479</v>
                                 </b>
                                 <b>
                                     <a>121</a>
                                     <b>299</b>
-                                    <v>11760</v>
+                                    <v>11761</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5670,22 +5630,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1538732</v>
+                                    <v>1538812</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>349048</v>
+                                    <v>349067</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>172172</v>
+                                    <v>172181</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>10</b>
-                                    <v>57861</v>
+                                    <v>57864</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5701,47 +5661,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>621890</v>
+                                    <v>621922</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>304359</v>
+                                    <v>304375</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>204631</v>
+                                    <v>204641</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>186755</v>
+                                    <v>186765</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>177817</v>
+                                    <v>177826</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>13</b>
-                                    <v>169349</v>
+                                    <v>169358</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>19</b>
-                                    <v>174524</v>
+                                    <v>174533</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>29</b>
-                                    <v>162764</v>
+                                    <v>162772</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>52</b>
-                                    <v>115722</v>
+                                    <v>115728</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5757,47 +5717,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>596488</v>
+                                    <v>596519</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>311415</v>
+                                    <v>311431</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>198986</v>
+                                    <v>198996</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>171701</v>
+                                    <v>171710</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>157589</v>
+                                    <v>157597</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>14</b>
-                                    <v>173583</v>
+                                    <v>173592</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>21</b>
-                                    <v>180169</v>
+                                    <v>180178</v>
                                 </b>
                                 <b>
                                     <a>21</a>
                                     <b>32</b>
-                                    <v>165116</v>
+                                    <v>165124</v>
                                 </b>
                                 <b>
                                     <a>32</a>
                                     <b>60</b>
-                                    <v>159000</v>
+                                    <v>159009</v>
                                 </b>
                                 <b>
                                     <a>60</a>
@@ -5862,7 +5822,7 @@
                                 </b>
                                 <b>
                                     <a>879</a>
-                                    <b>1081</b>
+                                    <b>1082</b>
                                     <v>3763</v>
                                 </b>
                                 <b>
@@ -5871,7 +5831,7 @@
                                     <v>3763</v>
                                 </b>
                                 <b>
-                                    <a>1309</a>
+                                    <a>1310</a>
                                     <b>1590</b>
                                     <v>3763</v>
                                 </b>
@@ -5894,7 +5854,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5644</v>
+                                    <v>5645</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5970,7 +5930,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5644</v>
+                                    <v>5645</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -6009,7 +5969,7 @@
                                 </b>
                                 <b>
                                     <a>575</a>
-                                    <b>628</b>
+                                    <b>627</b>
                                     <v>3763</v>
                                 </b>
                                 <b>
@@ -6081,7 +6041,7 @@
                                 <b>
                                     <a>35</a>
                                     <b>39</b>
-                                    <v>3292</v>
+                                    <v>3293</v>
                                 </b>
                                 <b>
                                     <a>39</a>
@@ -6122,7 +6082,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5644</v>
+                                    <v>5645</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -6192,11 +6152,11 @@
         </relation>
         <relation>
             <name>locations_stmt</name>
-            <cardinality>3805462</cardinality>
+            <cardinality>3805465</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3805462</v>
+                    <v>3805465</v>
                 </e>
                 <e>
                     <k>container</k>
@@ -6230,7 +6190,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3805462</v>
+                                    <v>3805465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6246,7 +6206,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3805462</v>
+                                    <v>3805465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6262,7 +6222,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3805462</v>
+                                    <v>3805465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6278,7 +6238,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3805462</v>
+                                    <v>3805465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6294,7 +6254,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3805462</v>
+                                    <v>3805465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6958,7 +6918,7 @@
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>10500</v>
+                                    <v>10501</v>
                                 </b>
                                 <b>
                                     <a>11</a>
@@ -8174,11 +8134,11 @@
         </relation>
         <relation>
             <name>locations_expr</name>
-            <cardinality>13128112</cardinality>
+            <cardinality>13128120</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>13128112</v>
+                    <v>13128120</v>
                 </e>
                 <e>
                     <k>container</k>
@@ -8212,7 +8172,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13128112</v>
+                                    <v>13128120</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8228,7 +8188,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13128112</v>
+                                    <v>13128120</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8244,7 +8204,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13128112</v>
+                                    <v>13128120</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8260,7 +8220,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13128112</v>
+                                    <v>13128120</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8276,7 +8236,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13128112</v>
+                                    <v>13128120</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10096,23 +10056,23 @@
         </relation>
         <relation>
             <name>numlines</name>
-            <cardinality>1406545</cardinality>
+            <cardinality>1406618</cardinality>
             <columnsizes>
                 <e>
                     <k>element_id</k>
-                    <v>1399488</v>
+                    <v>1399561</v>
                 </e>
                 <e>
                     <k>num_lines</k>
-                    <v>102550</v>
+                    <v>102556</v>
                 </e>
                 <e>
                     <k>num_code</k>
-                    <v>85615</v>
+                    <v>85620</v>
                 </e>
                 <e>
                     <k>num_comment</k>
-                    <v>60213</v>
+                    <v>60216</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10126,7 +10086,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1392432</v>
+                                    <v>1392505</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10147,7 +10107,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1393373</v>
+                                    <v>1393446</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10168,7 +10128,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1399488</v>
+                                    <v>1399561</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10184,17 +10144,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>68680</v>
+                                    <v>68684</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12230</v>
+                                    <v>12231</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>7526</v>
+                                    <v>7527</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -10220,12 +10180,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>71032</v>
+                                    <v>71036</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12230</v>
+                                    <v>12231</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -10256,22 +10216,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>70092</v>
+                                    <v>70095</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>15053</v>
+                                    <v>15054</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>10819</v>
+                                    <v>10820</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>6585</v>
+                                    <v>6586</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10287,22 +10247,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53157</v>
+                                    <v>53159</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>14582</v>
+                                    <v>14583</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>6585</v>
+                                    <v>6586</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>42</b>
-                                    <v>6585</v>
+                                    <v>6586</v>
                                 </b>
                                 <b>
                                     <a>44</a>
@@ -10323,12 +10283,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53157</v>
+                                    <v>53159</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>16934</v>
+                                    <v>16935</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -10338,7 +10298,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>6585</v>
+                                    <v>6586</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -10359,7 +10319,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53627</v>
+                                    <v>53630</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10369,7 +10329,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>7526</v>
+                                    <v>7527</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -10379,7 +10339,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>10</b>
-                                    <v>3292</v>
+                                    <v>3293</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10395,7 +10355,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>34810</v>
+                                    <v>34812</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10436,7 +10396,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>34810</v>
+                                    <v>34812</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10477,7 +10437,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>34810</v>
+                                    <v>34812</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10512,31 +10472,31 @@
         </relation>
         <relation>
             <name>diagnostics</name>
-            <cardinality>582773</cardinality>
+            <cardinality>72312</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>582773</v>
+                    <v>72312</v>
                 </e>
                 <e>
                     <k>severity</k>
-                    <v>209</v>
+                    <v>23</v>
                 </e>
                 <e>
                     <k>error_tag</k>
-                    <v>7851</v>
+                    <v>80</v>
                 </e>
                 <e>
                     <k>error_message</k>
-                    <v>56215</v>
+                    <v>127</v>
                 </e>
                 <e>
                     <k>full_error_message</k>
-                    <v>582040</v>
+                    <v>62738</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>369218</v>
+                    <v>150</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10550,7 +10510,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>582773</v>
+                                    <v>72312</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10566,7 +10526,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>582773</v>
+                                    <v>72312</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10582,7 +10542,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>582773</v>
+                                    <v>72312</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10598,7 +10558,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>582773</v>
+                                    <v>72312</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10614,7 +10574,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>582773</v>
+                                    <v>72312</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10628,14 +10588,14 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>254</a>
-                                    <b>255</b>
-                                    <v>104</v>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>11</v>
                                 </b>
                                 <b>
-                                    <a>5313</a>
-                                    <b>5314</b>
-                                    <v>104</v>
+                                    <a>6250</a>
+                                    <b>6251</b>
+                                    <v>11</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10649,14 +10609,14 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>104</v>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>11</v>
                                 </b>
                                 <b>
-                                    <a>70</a>
-                                    <b>71</b>
-                                    <v>104</v>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>11</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10669,508 +10629,388 @@
                         <hist>
                             <budget>12</budget>
                             <bs>
-                                <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>104</v>
-                                </b>
-                                <b>
-                                    <a>530</a>
-                                    <b>531</b>
-                                    <v>104</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>severity</src>
-                    <trg>full_error_message</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>254</a>
-                                    <b>255</b>
-                                    <v>104</v>
-                                </b>
-                                <b>
-                                    <a>5306</a>
-                                    <b>5307</b>
-                                    <v>104</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>severity</src>
-                    <trg>location</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>174</a>
-                                    <b>175</b>
-                                    <v>104</v>
-                                </b>
-                                <b>
-                                    <a>3429</a>
-                                    <b>3430</b>
-                                    <v>104</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>error_tag</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1046</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>942</v>
-                                </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>523</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>523</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>7</b>
-                                    <v>628</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>11</b>
-                                    <v>628</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>16</b>
-                                    <v>628</v>
-                                </b>
-                                <b>
-                                    <a>16</a>
-                                    <b>21</b>
-                                    <v>628</v>
-                                </b>
-                                <b>
-                                    <a>21</a>
-                                    <b>32</b>
-                                    <v>628</v>
-                                </b>
-                                <b>
-                                    <a>44</a>
-                                    <b>72</b>
-                                    <v>628</v>
-                                </b>
-                                <b>
-                                    <a>112</a>
-                                    <b>540</b>
-                                    <v>628</v>
-                                </b>
-                                <b>
-                                    <a>595</a>
-                                    <b>1254</b>
-                                    <v>418</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>error_tag</src>
-                    <trg>severity</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>7851</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>error_tag</src>
-                    <trg>error_message</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5443</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>418</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>523</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>628</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>35</b>
-                                    <v>628</v>
-                                </b>
-                                <b>
-                                    <a>59</a>
-                                    <b>294</b>
-                                    <v>209</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>error_tag</src>
-                    <trg>full_error_message</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1151</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>942</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>523</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>523</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>7</b>
-                                    <v>628</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>12</b>
-                                    <v>628</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>16</b>
-                                    <v>523</v>
-                                </b>
-                                <b>
-                                    <a>16</a>
-                                    <b>21</b>
-                                    <v>628</v>
-                                </b>
-                                <b>
-                                    <a>21</a>
-                                    <b>32</b>
-                                    <v>628</v>
-                                </b>
-                                <b>
-                                    <a>44</a>
-                                    <b>72</b>
-                                    <v>628</v>
-                                </b>
-                                <b>
-                                    <a>112</a>
-                                    <b>540</b>
-                                    <v>628</v>
-                                </b>
-                                <b>
-                                    <a>595</a>
-                                    <b>1254</b>
-                                    <v>418</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>error_tag</src>
-                    <trg>location</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1674</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>942</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>418</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>523</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>523</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>523</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>15</b>
-                                    <v>628</v>
-                                </b>
-                                <b>
-                                    <a>15</a>
-                                    <b>20</b>
-                                    <v>628</v>
-                                </b>
-                                <b>
-                                    <a>23</a>
-                                    <b>44</b>
-                                    <v>628</v>
-                                </b>
-                                <b>
-                                    <a>44</a>
-                                    <b>95</b>
-                                    <v>628</v>
-                                </b>
-                                <b>
-                                    <a>139</a>
-                                    <b>630</b>
-                                    <v>628</v>
-                                </b>
-                                <b>
-                                    <a>764</a>
-                                    <b>765</b>
-                                    <v>104</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>error_message</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>24809</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>13608</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>4187</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>4606</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>14</b>
-                                    <v>4292</v>
-                                </b>
-                                <b>
-                                    <a>14</a>
-                                    <b>227</b>
-                                    <v>4292</v>
-                                </b>
-                                <b>
-                                    <a>405</a>
-                                    <b>1254</b>
-                                    <v>418</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>error_message</src>
-                    <trg>severity</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>56215</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>error_message</src>
-                    <trg>error_tag</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>56215</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>error_message</src>
-                    <trg>full_error_message</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>24914</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>13608</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>4187</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>4606</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>15</b>
-                                    <v>4396</v>
-                                </b>
-                                <b>
-                                    <a>15</a>
-                                    <b>540</b>
-                                    <v>4292</v>
-                                </b>
-                                <b>
-                                    <a>595</a>
-                                    <b>1254</b>
-                                    <v>209</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>error_message</src>
-                    <trg>location</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>36011</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>6909</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>5</b>
-                                    <v>4710</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>12</b>
-                                    <v>4292</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>765</b>
-                                    <v>4292</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>full_error_message</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>581935</v>
+                                    <v>11</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>104</v>
+                                    <v>11</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>severity</src>
+                    <trg>full_error_message</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>5422</a>
+                                    <b>5423</b>
+                                    <v>11</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>severity</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>11</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>error_tag</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>417</a>
+                                    <b>418</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>829</a>
+                                    <b>830</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>4996</a>
+                                    <b>4997</b>
+                                    <v>11</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>error_tag</src>
+                    <trg>severity</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>80</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>error_tag</src>
+                    <trg>error_message</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>57</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>23</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>error_tag</src>
+                    <trg>full_error_message</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>23</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>417</a>
+                                    <b>418</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>4996</a>
+                                    <b>4997</b>
+                                    <v>11</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>error_tag</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>46</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>11</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>error_message</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>23</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>75</a>
+                                    <b>76</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>332</a>
+                                    <b>333</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>829</a>
+                                    <b>830</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>4996</a>
+                                    <b>4997</b>
+                                    <v>11</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>error_message</src>
+                    <trg>severity</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>127</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>error_message</src>
+                    <trg>error_tag</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>127</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>error_message</src>
+                    <trg>full_error_message</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>46</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>23</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>75</a>
+                                    <b>76</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>332</a>
+                                    <b>333</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>4996</a>
+                                    <b>4997</b>
+                                    <v>11</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>error_message</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>92</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>23</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>11</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>full_error_message</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>62726</v>
+                                </b>
+                                <b>
+                                    <a>829</a>
+                                    <b>830</b>
+                                    <v>11</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11186,7 +11026,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>582040</v>
+                                    <v>62738</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11202,7 +11042,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>582040</v>
+                                    <v>62738</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11218,7 +11058,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>582040</v>
+                                    <v>62738</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11234,7 +11074,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>582040</v>
+                                    <v>62738</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11250,17 +11090,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>206959</v>
+                                    <v>138</v>
                                 </b>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>135774</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>13</b>
-                                    <v>26484</v>
+                                    <a>6242</a>
+                                    <b>6243</b>
+                                    <v>11</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11276,12 +11111,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>361262</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>7955</v>
+                                    <v>150</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11297,12 +11127,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>354458</v>
+                                    <v>138</v>
                                 </b>
                                 <b>
-                                    <a>2</a>
-                                    <b>6</b>
-                                    <v>14760</v>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>11</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11318,12 +11148,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>353830</v>
+                                    <v>138</v>
                                 </b>
                                 <b>
-                                    <a>2</a>
+                                    <a>5</a>
                                     <b>6</b>
-                                    <v>15388</v>
+                                    <v>11</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11339,17 +11169,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>207063</v>
+                                    <v>138</v>
                                 </b>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>135774</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>13</b>
-                                    <v>26380</v>
+                                    <a>5414</a>
+                                    <b>5415</b>
+                                    <v>11</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11359,15 +11184,15 @@
         </relation>
         <relation>
             <name>files</name>
-            <cardinality>124189</cardinality>
+            <cardinality>124196</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>124189</v>
+                    <v>124196</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>124189</v>
+                    <v>124196</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11381,7 +11206,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>124189</v>
+                                    <v>124196</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11397,7 +11222,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>124189</v>
+                                    <v>124196</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11455,7 +11280,7 @@
         </relation>
         <relation>
             <name>containerparent</name>
-            <cardinality>139243</cardinality>
+            <cardinality>139250</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
@@ -11463,7 +11288,7 @@
                 </e>
                 <e>
                     <k>child</k>
-                    <v>139243</v>
+                    <v>139250</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11482,7 +11307,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3292</v>
+                                    <v>3293</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -11518,7 +11343,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>139243</v>
+                                    <v>139250</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11528,11 +11353,11 @@
         </relation>
         <relation>
             <name>fileannotations</name>
-            <cardinality>5254886</cardinality>
+            <cardinality>5253841</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5019</v>
+                    <v>5018</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -11540,11 +11365,11 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>56112</v>
+                    <v>56101</v>
                 </e>
                 <e>
                     <k>value</k>
-                    <v>47173</v>
+                    <v>47163</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11563,7 +11388,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4845</v>
+                                    <v>4844</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11624,7 +11449,7 @@
                                 <b>
                                     <a>936</a>
                                     <b>937</b>
-                                    <v>1457</v>
+                                    <v>1456</v>
                                 </b>
                                 <b>
                                     <a>1083</a>
@@ -11690,7 +11515,7 @@
                                 <b>
                                     <a>1501</a>
                                     <b>1502</b>
-                                    <v>1457</v>
+                                    <v>1456</v>
                                 </b>
                                 <b>
                                     <a>1504</a>
@@ -11779,12 +11604,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9078</v>
+                                    <v>9076</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6372</v>
+                                    <v>6370</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -11794,12 +11619,12 @@
                                 <b>
                                     <a>5</a>
                                     <b>9</b>
-                                    <v>4371</v>
+                                    <v>4370</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>14</b>
-                                    <v>4082</v>
+                                    <v>4081</v>
                                 </b>
                                 <b>
                                     <a>14</a>
@@ -11809,27 +11634,27 @@
                                 <b>
                                     <a>18</a>
                                     <b>20</b>
-                                    <v>4834</v>
+                                    <v>4833</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>34</b>
-                                    <v>4325</v>
+                                    <v>4324</v>
                                 </b>
                                 <b>
                                     <a>34</a>
                                     <b>128</b>
-                                    <v>4614</v>
+                                    <v>4613</v>
                                 </b>
                                 <b>
                                     <a>128</a>
                                     <b>229</b>
-                                    <v>4221</v>
+                                    <v>4220</v>
                                 </b>
                                 <b>
                                     <a>229</a>
                                     <b>387</b>
-                                    <v>4348</v>
+                                    <v>4347</v>
                                 </b>
                                 <b>
                                     <a>387</a>
@@ -11850,7 +11675,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>56112</v>
+                                    <v>56101</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11866,17 +11691,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9089</v>
+                                    <v>9088</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8257</v>
+                                    <v>8255</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2625</v>
+                                    <v>2624</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -11886,37 +11711,37 @@
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>4232</v>
+                                    <v>4231</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>14</b>
-                                    <v>4313</v>
+                                    <v>4312</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>17</b>
-                                    <v>4232</v>
+                                    <v>4231</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>22</b>
-                                    <v>4706</v>
+                                    <v>4705</v>
                                 </b>
                                 <b>
                                     <a>22</a>
                                     <b>41</b>
-                                    <v>4313</v>
+                                    <v>4312</v>
                                 </b>
                                 <b>
                                     <a>41</a>
                                     <b>82</b>
-                                    <v>4267</v>
+                                    <v>4266</v>
                                 </b>
                                 <b>
                                     <a>82</a>
                                     <b>157</b>
-                                    <v>4209</v>
+                                    <v>4208</v>
                                 </b>
                                 <b>
                                     <a>158</a>
@@ -11937,7 +11762,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7332</v>
+                                    <v>7330</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11947,7 +11772,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>3411</v>
+                                    <v>3410</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -11957,22 +11782,22 @@
                                 <b>
                                     <a>15</a>
                                     <b>17</b>
-                                    <v>2602</v>
+                                    <v>2601</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>19</b>
-                                    <v>4244</v>
+                                    <v>4243</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>34</b>
-                                    <v>3411</v>
+                                    <v>3410</v>
                                 </b>
                                 <b>
                                     <a>34</a>
                                     <b>189</b>
-                                    <v>3712</v>
+                                    <v>3711</v>
                                 </b>
                                 <b>
                                     <a>189</a>
@@ -11987,12 +11812,12 @@
                                 <b>
                                     <a>266</a>
                                     <b>321</b>
-                                    <v>3770</v>
+                                    <v>3769</v>
                                 </b>
                                 <b>
                                     <a>322</a>
                                     <b>399</b>
-                                    <v>4047</v>
+                                    <v>4046</v>
                                 </b>
                                 <b>
                                     <a>399</a>
@@ -12013,7 +11838,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>47161</v>
+                                    <v>47152</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12034,17 +11859,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7355</v>
+                                    <v>7353</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>2648</v>
+                                    <v>2647</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>3596</v>
+                                    <v>3595</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -12059,17 +11884,17 @@
                                 <b>
                                     <a>17</a>
                                     <b>19</b>
-                                    <v>3677</v>
+                                    <v>3676</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>29</b>
-                                    <v>3596</v>
+                                    <v>3595</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>39</b>
-                                    <v>3758</v>
+                                    <v>3757</v>
                                 </b>
                                 <b>
                                     <a>39</a>
@@ -12079,7 +11904,7 @@
                                 <b>
                                     <a>48</a>
                                     <b>74</b>
-                                    <v>3654</v>
+                                    <v>3653</v>
                                 </b>
                                 <b>
                                     <a>74</a>
@@ -12089,7 +11914,7 @@
                                 <b>
                                     <a>102</a>
                                     <b>119</b>
-                                    <v>3689</v>
+                                    <v>3688</v>
                                 </b>
                                 <b>
                                     <a>119</a>
@@ -12104,15 +11929,15 @@
         </relation>
         <relation>
             <name>inmacroexpansion</name>
-            <cardinality>109313317</cardinality>
+            <cardinality>109313388</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>17941916</v>
+                    <v>17941927</v>
                 </e>
                 <e>
                     <k>inv</k>
-                    <v>2682068</v>
+                    <v>2682069</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12126,32 +11951,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>3</b>
-                                    <v>1566018</v>
+                                    <v>1566019</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>1071344</v>
+                                    <v>1071345</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>1179814</v>
+                                    <v>1179815</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>4800000</v>
+                                    <v>4800003</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>6359380</v>
+                                    <v>6359384</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>2595248</v>
+                                    <v>2595250</v>
                                 </b>
                                 <b>
                                     <a>9</a>
@@ -12172,12 +11997,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>371855</v>
+                                    <v>371856</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>540116</v>
+                                    <v>540113</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -12212,7 +12037,7 @@
                                 <b>
                                     <a>11</a>
                                     <b>337</b>
-                                    <v>223911</v>
+                                    <v>223913</v>
                                 </b>
                                 <b>
                                     <a>339</a>
@@ -12232,15 +12057,15 @@
         </relation>
         <relation>
             <name>affectedbymacroexpansion</name>
-            <cardinality>35540532</cardinality>
+            <cardinality>35540555</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5135277</v>
+                    <v>5135280</v>
                 </e>
                 <e>
                     <k>inv</k>
-                    <v>2773181</v>
+                    <v>2773183</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12254,7 +12079,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2804212</v>
+                                    <v>2804214</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12279,7 +12104,7 @@
                                 <b>
                                     <a>12</a>
                                     <b>50</b>
-                                    <v>405705</v>
+                                    <v>405706</v>
                                 </b>
                                 <b>
                                     <a>50</a>
@@ -12305,7 +12130,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>230823</v>
+                                    <v>230824</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -12315,7 +12140,7 @@
                                 <b>
                                     <a>9</a>
                                     <b>12</b>
-                                    <v>250042</v>
+                                    <v>250043</v>
                                 </b>
                                 <b>
                                     <a>12</a>
@@ -12345,7 +12170,7 @@
                                 <b>
                                     <a>17</a>
                                     <b>18</b>
-                                    <v>146328</v>
+                                    <v>146329</v>
                                 </b>
                                 <b>
                                     <a>18</a>
@@ -12370,19 +12195,19 @@
         </relation>
         <relation>
             <name>macroinvocations</name>
-            <cardinality>33894981</cardinality>
+            <cardinality>33889080</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>33894981</v>
+                    <v>33889080</v>
                 </e>
                 <e>
                     <k>macro_id</k>
-                    <v>81381</v>
+                    <v>81423</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>778557</v>
+                    <v>778830</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -12400,7 +12225,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33894981</v>
+                                    <v>33889080</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12416,7 +12241,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33894981</v>
+                                    <v>33889080</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12432,7 +12257,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33894981</v>
+                                    <v>33889080</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12448,12 +12273,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17578</v>
+                                    <v>17575</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>16977</v>
+                                    <v>16973</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -12463,42 +12288,42 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>4880</v>
+                                    <v>4879</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>6048</v>
+                                    <v>6047</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>14</b>
-                                    <v>6406</v>
+                                    <v>6440</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>29</b>
-                                    <v>6291</v>
+                                    <v>6313</v>
                                 </b>
                                 <b>
                                     <a>29</a>
-                                    <b>72</b>
-                                    <v>6106</v>
+                                    <b>73</b>
+                                    <v>6220</v>
                                 </b>
                                 <b>
-                                    <a>72</a>
-                                    <b>247</b>
-                                    <v>6129</v>
+                                    <a>73</a>
+                                    <b>257</b>
+                                    <v>6139</v>
                                 </b>
                                 <b>
-                                    <a>248</a>
-                                    <b>4166</b>
-                                    <v>6106</v>
+                                    <a>257</a>
+                                    <b>5769</b>
+                                    <v>6116</v>
                                 </b>
                                 <b>
-                                    <a>4220</a>
+                                    <a>6272</a>
                                     <b>168296</b>
-                                    <v>1156</v>
+                                    <v>1017</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12514,32 +12339,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>43506</v>
+                                    <v>43498</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10651</v>
+                                    <v>10649</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5285</v>
+                                    <v>5284</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>6985</v>
+                                    <v>7018</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>13</b>
-                                    <v>6626</v>
+                                    <v>6636</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>66</b>
-                                    <v>6140</v>
+                                    <v>6151</v>
                                 </b>
                                 <b>
                                     <a>66</a>
@@ -12560,12 +12385,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>75553</v>
+                                    <v>75538</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5828</v>
+                                    <v>5885</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12581,37 +12406,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>320982</v>
+                                    <v>321115</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>177751</v>
+                                    <v>177878</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>47300</v>
+                                    <v>47313</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>59605</v>
+                                    <v>59616</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>9</b>
-                                    <v>68533</v>
+                                    <v>68542</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>23</b>
-                                    <v>58425</v>
+                                    <v>58414</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>244365</b>
-                                    <v>45958</v>
+                                    <v>45949</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12627,12 +12452,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>731280</v>
+                                    <v>731563</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>350</b>
-                                    <v>47277</v>
+                                    <v>47267</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12648,7 +12473,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>778557</v>
+                                    <v>778830</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12662,13 +12487,13 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>20414</a>
-                                    <b>20415</b>
+                                    <a>20464</a>
+                                    <b>20465</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>2910446</a>
-                                    <b>2910447</b>
+                                    <a>2910469</a>
+                                    <b>2910470</b>
                                     <v>11</v>
                                 </b>
                             </bs>
@@ -12683,13 +12508,13 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>2123</a>
-                                    <b>2124</b>
+                                    <a>2128</a>
+                                    <b>2129</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>5418</a>
-                                    <b>5419</b>
+                                    <a>5423</a>
+                                    <b>5424</b>
                                     <v>11</v>
                                 </b>
                             </bs>
@@ -12704,13 +12529,13 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>6291</a>
-                                    <b>6292</b>
+                                    <a>6315</a>
+                                    <b>6316</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>61030</a>
-                                    <b>61031</b>
+                                    <a>61043</a>
+                                    <b>61044</b>
                                     <v>11</v>
                                 </b>
                             </bs>
@@ -12721,15 +12546,15 @@
         </relation>
         <relation>
             <name>macroparent</name>
-            <cardinality>30455592</cardinality>
+            <cardinality>30449647</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>30455592</v>
+                    <v>30449647</v>
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>23698199</v>
+                    <v>23693599</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12743,7 +12568,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30455592</v>
+                                    <v>30449647</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12759,17 +12584,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18307171</v>
+                                    <v>18303643</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4540062</v>
+                                    <v>4539159</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>88</b>
-                                    <v>850965</v>
+                                    <v>850796</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12779,15 +12604,15 @@
         </relation>
         <relation>
             <name>macrolocationbind</name>
-            <cardinality>3984640</cardinality>
+            <cardinality>3984515</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2778886</v>
+                    <v>2778799</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>1988454</v>
+                    <v>1988392</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12801,22 +12626,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2183104</v>
+                                    <v>2183036</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>336443</v>
+                                    <v>336432</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>229815</v>
+                                    <v>229808</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>57</b>
-                                    <v>29523</v>
+                                    <v>29522</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12832,22 +12657,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1589588</v>
+                                    <v>1589539</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>169647</v>
+                                    <v>169641</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>154233</v>
+                                    <v>154228</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>723</b>
-                                    <v>74984</v>
+                                    <v>74982</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12857,11 +12682,11 @@
         </relation>
         <relation>
             <name>macro_argument_unexpanded</name>
-            <cardinality>86176782</cardinality>
+            <cardinality>86159621</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>26568343</v>
+                    <v>26563044</v>
                 </e>
                 <e>
                     <k>argument_index</k>
@@ -12869,7 +12694,7 @@
                 </e>
                 <e>
                     <k>text</k>
-                    <v>326094</v>
+                    <v>326029</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12883,22 +12708,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7436793</v>
+                                    <v>7435302</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10861692</v>
+                                    <v>10859530</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6256808</v>
+                                    <v>6255563</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>2013048</v>
+                                    <v>2012648</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12914,22 +12739,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7508010</v>
+                                    <v>7506504</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>11011561</v>
+                                    <v>11009369</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6087232</v>
+                                    <v>6086021</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1961538</v>
+                                    <v>1961148</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12954,7 +12779,7 @@
                                 </b>
                                 <b>
                                     <a>715085</a>
-                                    <b>2297335</b>
+                                    <b>2297334</b>
                                     <v>34</v>
                                 </b>
                             </bs>
@@ -12997,57 +12822,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40858</v>
+                                    <v>40850</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>65607</v>
+                                    <v>65594</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>15184</v>
+                                    <v>15181</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>45102</v>
+                                    <v>45093</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>25569</v>
+                                    <v>25576</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>12</b>
-                                    <v>16075</v>
+                                    <v>16060</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>16</b>
-                                    <v>22297</v>
+                                    <v>22292</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>23</b>
-                                    <v>26518</v>
+                                    <v>26512</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>43</b>
-                                    <v>24748</v>
+                                    <v>24743</v>
                                 </b>
                                 <b>
                                     <a>43</a>
                                     <b>164</b>
-                                    <v>24459</v>
+                                    <v>24454</v>
                                 </b>
                                 <b>
                                     <a>164</a>
                                     <b>521384</b>
-                                    <v>19671</v>
+                                    <v>19667</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13063,17 +12888,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>235830</v>
+                                    <v>235783</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>79728</v>
+                                    <v>79712</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>10535</v>
+                                    <v>10533</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13083,11 +12908,11 @@
         </relation>
         <relation>
             <name>macro_argument_expanded</name>
-            <cardinality>86176782</cardinality>
+            <cardinality>86159621</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>26568343</v>
+                    <v>26563044</v>
                 </e>
                 <e>
                     <k>argument_index</k>
@@ -13095,7 +12920,7 @@
                 </e>
                 <e>
                     <k>text</k>
-                    <v>197597</v>
+                    <v>197580</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13109,22 +12934,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7436793</v>
+                                    <v>7435302</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10861692</v>
+                                    <v>10859530</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6256808</v>
+                                    <v>6255563</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>2013048</v>
+                                    <v>2012648</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13140,22 +12965,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10747743</v>
+                                    <v>10745593</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9374139</v>
+                                    <v>9372273</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5306998</v>
+                                    <v>5305941</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>1139462</v>
+                                    <v>1139235</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13180,7 +13005,7 @@
                                 </b>
                                 <b>
                                     <a>715085</a>
-                                    <b>2297335</b>
+                                    <b>2297334</b>
                                     <v>34</v>
                                 </b>
                             </bs>
@@ -13206,7 +13031,7 @@
                                 </b>
                                 <b>
                                     <a>870</a>
-                                    <b>13877</b>
+                                    <b>13879</b>
                                     <v>46</v>
                                 </b>
                             </bs>
@@ -13223,62 +13048,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>24552</v>
+                                    <v>24547</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>41147</v>
+                                    <v>41151</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6927</v>
+                                    <v>6925</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>16364</v>
+                                    <v>16361</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>2995</v>
+                                    <v>2994</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>23291</v>
+                                    <v>23286</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>15982</v>
+                                    <v>15991</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>15</b>
-                                    <v>16699</v>
+                                    <v>16696</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>31</b>
-                                    <v>15589</v>
+                                    <v>15586</v>
                                 </b>
                                 <b>
                                     <a>31</a>
                                     <b>97</b>
-                                    <v>15080</v>
+                                    <v>15077</v>
                                 </b>
                                 <b>
                                     <a>97</a>
                                     <b>775</b>
-                                    <v>15485</v>
+                                    <v>15482</v>
                                 </b>
                                 <b>
                                     <a>775</a>
-                                    <b>1052916</b>
-                                    <v>3481</v>
+                                    <b>1052906</b>
+                                    <v>3480</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13294,17 +13119,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>99989</v>
+                                    <v>99992</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>82850</v>
+                                    <v>82834</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>66</b>
-                                    <v>14756</v>
+                                    <v>14753</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13314,19 +13139,19 @@
         </relation>
         <relation>
             <name>functions</name>
-            <cardinality>4726273</cardinality>
+            <cardinality>4726519</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4726273</v>
+                    <v>4726519</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1934352</v>
+                    <v>1934453</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>3292</v>
+                    <v>3293</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13340,7 +13165,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4726273</v>
+                                    <v>4726519</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13356,7 +13181,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4726273</v>
+                                    <v>4726519</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13372,22 +13197,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1516622</v>
+                                    <v>1516701</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>154296</v>
+                                    <v>154304</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>151003</v>
+                                    <v>151011</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>1724</b>
-                                    <v>112429</v>
+                                    <v>112435</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13403,7 +13228,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1933881</v>
+                                    <v>1933982</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13510,15 +13335,15 @@
         </relation>
         <relation>
             <name>function_entry_point</name>
-            <cardinality>1176981</cardinality>
+            <cardinality>1177043</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1167103</v>
+                    <v>1167163</v>
                 </e>
                 <e>
                     <k>entry_point</k>
-                    <v>1176981</v>
+                    <v>1177043</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13532,12 +13357,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1157224</v>
+                                    <v>1157284</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9878</v>
+                                    <v>9879</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13553,7 +13378,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1176981</v>
+                                    <v>1177043</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13563,15 +13388,15 @@
         </relation>
         <relation>
             <name>function_return_type</name>
-            <cardinality>4734741</cardinality>
+            <cardinality>4734987</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4726273</v>
+                    <v>4726519</v>
                 </e>
                 <e>
                     <k>return_type</k>
-                    <v>1016569</v>
+                    <v>1016622</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13585,7 +13410,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4719217</v>
+                                    <v>4719463</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13606,22 +13431,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>523103</v>
+                                    <v>523130</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>390445</v>
+                                    <v>390465</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>11</b>
-                                    <v>78559</v>
+                                    <v>78563</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>2516</b>
-                                    <v>24461</v>
+                                    <v>24462</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13639,7 +13464,7 @@
                 </e>
                 <e>
                     <k>traits</k>
-                    <v>1</v>
+                    <v>2</v>
                 </e>
                 <e>
                     <k>handle</k>
@@ -13707,9 +13532,9 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13723,9 +13548,9 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13739,9 +13564,9 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13943,48 +13768,48 @@
         </relation>
         <relation>
             <name>purefunctions</name>
-            <cardinality>99446</cardinality>
+            <cardinality>99447</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>99446</v>
+                    <v>99447</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_deleted</name>
-            <cardinality>140654</cardinality>
+            <cardinality>140661</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>140654</v>
+                    <v>140661</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_defaulted</name>
-            <cardinality>74325</cardinality>
+            <cardinality>74329</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>74325</v>
+                    <v>74329</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>member_function_this_type</name>
-            <cardinality>553641</cardinality>
+            <cardinality>553316</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>553641</v>
+                    <v>553316</v>
                 </e>
                 <e>
                     <k>this_type</k>
-                    <v>189690</v>
+                    <v>189579</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13998,7 +13823,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>553641</v>
+                                    <v>553316</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14014,32 +13839,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>68526</v>
+                                    <v>68486</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>45414</v>
+                                    <v>45387</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>30475</v>
+                                    <v>30458</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>15537</v>
+                                    <v>15528</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>15607</v>
+                                    <v>15598</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>66</b>
-                                    <v>14128</v>
+                                    <v>14119</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14049,27 +13874,27 @@
         </relation>
         <relation>
             <name>fun_decls</name>
-            <cardinality>5102136</cardinality>
+            <cardinality>5102402</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5096962</v>
+                    <v>5097227</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>4578563</v>
+                    <v>4578801</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1013276</v>
+                    <v>1013329</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1836035</v>
+                    <v>1836130</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>3461324</v>
+                    <v>3461504</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14083,7 +13908,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5096962</v>
+                                    <v>5097227</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14099,7 +13924,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5091787</v>
+                                    <v>5092052</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14120,7 +13945,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5096962</v>
+                                    <v>5097227</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14136,7 +13961,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5096962</v>
+                                    <v>5097227</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14152,17 +13977,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4141075</v>
+                                    <v>4141291</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>363161</v>
+                                    <v>363180</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>74325</v>
+                                    <v>74329</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14178,12 +14003,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4536696</v>
+                                    <v>4536932</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>41867</v>
+                                    <v>41869</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14199,7 +14024,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4578563</v>
+                                    <v>4578801</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14215,12 +14040,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4197996</v>
+                                    <v>4198214</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>379155</v>
+                                    <v>379175</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -14241,22 +14066,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>445954</v>
+                                    <v>445977</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>453481</v>
+                                    <v>453505</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>79500</v>
+                                    <v>79504</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>2768</b>
-                                    <v>34340</v>
+                                    <v>34342</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14272,22 +14097,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>530629</v>
+                                    <v>530657</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>381978</v>
+                                    <v>381998</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>11</b>
-                                    <v>77148</v>
+                                    <v>77152</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>2477</b>
-                                    <v>23520</v>
+                                    <v>23522</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14303,17 +14128,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>883912</v>
+                                    <v>883958</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>90319</v>
+                                    <v>90324</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>822</b>
-                                    <v>39044</v>
+                                    <v>39046</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14329,22 +14154,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>779480</v>
+                                    <v>779520</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>133127</v>
+                                    <v>133134</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>11</b>
-                                    <v>78089</v>
+                                    <v>78093</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>2030</b>
-                                    <v>22579</v>
+                                    <v>22581</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14360,27 +14185,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1245192</v>
+                                    <v>1245257</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>269548</v>
+                                    <v>269562</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>80441</v>
+                                    <v>80445</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>138772</v>
+                                    <v>138780</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>1758</b>
-                                    <v>102080</v>
+                                    <v>102085</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14396,22 +14221,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1425832</v>
+                                    <v>1425906</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>153355</v>
+                                    <v>153363</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>145358</v>
+                                    <v>145366</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>1708</b>
-                                    <v>111488</v>
+                                    <v>111494</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14427,17 +14252,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1615880</v>
+                                    <v>1615964</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>135009</v>
+                                    <v>135016</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>954</b>
-                                    <v>85145</v>
+                                    <v>85149</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14453,27 +14278,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1266831</v>
+                                    <v>1266897</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>296362</v>
+                                    <v>296377</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>79500</v>
+                                    <v>79504</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>139243</v>
+                                    <v>139250</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>664</b>
-                                    <v>54097</v>
+                                    <v>54100</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14489,17 +14314,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2995611</v>
+                                    <v>2995767</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>302007</v>
+                                    <v>302023</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>55</b>
-                                    <v>163704</v>
+                                    <v>163713</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14515,17 +14340,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3063351</v>
+                                    <v>3063511</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>268607</v>
+                                    <v>268621</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>55</b>
-                                    <v>129364</v>
+                                    <v>129371</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14541,12 +14366,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3245873</v>
+                                    <v>3246042</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>27</b>
-                                    <v>215450</v>
+                                    <v>215461</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14562,12 +14387,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3285388</v>
+                                    <v>3285559</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>13</b>
-                                    <v>175935</v>
+                                    <v>175944</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14577,22 +14402,22 @@
         </relation>
         <relation>
             <name>fun_def</name>
-            <cardinality>1963988</cardinality>
+            <cardinality>1964090</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1963988</v>
+                    <v>1964090</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>fun_specialized</name>
-            <cardinality>26343</cardinality>
+            <cardinality>26344</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>26343</v>
+                    <v>26344</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -14610,11 +14435,11 @@
         </relation>
         <relation>
             <name>fun_decl_specifiers</name>
-            <cardinality>2937280</cardinality>
+            <cardinality>2937433</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1710904</v>
+                    <v>1710993</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -14632,17 +14457,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>503345</v>
+                                    <v>503371</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1188742</v>
+                                    <v>1188804</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>18816</v>
+                                    <v>18817</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14814,26 +14639,26 @@
         </relation>
         <relation>
             <name>fun_decl_empty_throws</name>
-            <cardinality>1978101</cardinality>
+            <cardinality>1978204</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>1978101</v>
+                    <v>1978204</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>fun_decl_noexcept</name>
-            <cardinality>61239</cardinality>
+            <cardinality>61252</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>61239</v>
+                    <v>61252</v>
                 </e>
                 <e>
                     <k>constant</k>
-                    <v>61135</v>
+                    <v>61148</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14847,7 +14672,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>61239</v>
+                                    <v>61252</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14863,7 +14688,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>61030</v>
+                                    <v>61043</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14878,11 +14703,11 @@
         </relation>
         <relation>
             <name>fun_decl_empty_noexcept</name>
-            <cardinality>888146</cardinality>
+            <cardinality>888192</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>888146</v>
+                    <v>888192</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -14987,11 +14812,11 @@
         </relation>
         <relation>
             <name>param_decl_bind</name>
-            <cardinality>7472094</cardinality>
+            <cardinality>7472483</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7472094</v>
+                    <v>7472483</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -14999,7 +14824,7 @@
                 </e>
                 <e>
                     <k>fun_decl</k>
-                    <v>4286434</v>
+                    <v>4286657</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -15013,7 +14838,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7472094</v>
+                                    <v>7472483</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15029,7 +14854,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7472094</v>
+                                    <v>7472483</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15207,22 +15032,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2409002</v>
+                                    <v>2409127</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1071608</v>
+                                    <v>1071664</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>506638</v>
+                                    <v>506664</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>18</b>
-                                    <v>299184</v>
+                                    <v>299200</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15238,22 +15063,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2409002</v>
+                                    <v>2409127</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1071608</v>
+                                    <v>1071664</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>506638</v>
+                                    <v>506664</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>18</b>
-                                    <v>299184</v>
+                                    <v>299200</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15263,27 +15088,27 @@
         </relation>
         <relation>
             <name>var_decls</name>
-            <cardinality>8611913</cardinality>
+            <cardinality>8612362</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>8543232</v>
+                    <v>8543677</v>
                 </e>
                 <e>
                     <k>variable</k>
-                    <v>7520077</v>
+                    <v>7520468</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>2430641</v>
+                    <v>2430768</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>672695</v>
+                    <v>672730</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5365099</v>
+                    <v>5365378</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -15297,7 +15122,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8543232</v>
+                                    <v>8543677</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15313,12 +15138,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8474552</v>
+                                    <v>8474993</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>68680</v>
+                                    <v>68684</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15334,7 +15159,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8543232</v>
+                                    <v>8543677</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15350,7 +15175,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8543232</v>
+                                    <v>8543677</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15366,17 +15191,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6658274</v>
+                                    <v>6658620</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>707035</v>
+                                    <v>707072</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>154767</v>
+                                    <v>154775</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15392,12 +15217,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7346963</v>
+                                    <v>7347346</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>173113</v>
+                                    <v>173122</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15413,12 +15238,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7402943</v>
+                                    <v>7403328</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>117133</v>
+                                    <v>117139</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15434,12 +15259,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6967337</v>
+                                    <v>6967700</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>552739</v>
+                                    <v>552768</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15455,27 +15280,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1505802</v>
+                                    <v>1505881</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>516046</v>
+                                    <v>516073</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>98787</v>
+                                    <v>98792</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>188636</v>
+                                    <v>188646</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>780</b>
-                                    <v>121367</v>
+                                    <v>121373</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15491,22 +15316,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1640342</v>
+                                    <v>1640427</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>491114</v>
+                                    <v>491140</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>188166</v>
+                                    <v>188176</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>742</b>
-                                    <v>111018</v>
+                                    <v>111024</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15522,17 +15347,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1918828</v>
+                                    <v>1918928</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>388563</v>
+                                    <v>388584</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>128</b>
-                                    <v>123249</v>
+                                    <v>123255</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15548,22 +15373,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1743833</v>
+                                    <v>1743924</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>406910</v>
+                                    <v>406931</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>190048</v>
+                                    <v>190058</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>595</b>
-                                    <v>89849</v>
+                                    <v>89854</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15579,37 +15404,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>343874</v>
+                                    <v>343892</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>87497</v>
+                                    <v>87502</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>48923</v>
+                                    <v>48925</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>52216</v>
+                                    <v>52218</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>12</b>
-                                    <v>52686</v>
+                                    <v>52689</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>33</b>
-                                    <v>50804</v>
+                                    <v>50807</v>
                                 </b>
                                 <b>
                                     <a>34</a>
                                     <b>3281</b>
-                                    <v>36692</v>
+                                    <v>36694</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15625,37 +15450,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>371628</v>
+                                    <v>371648</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>78559</v>
+                                    <v>78563</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>45630</v>
+                                    <v>45632</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>49864</v>
+                                    <v>49866</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>14</b>
-                                    <v>53627</v>
+                                    <v>53630</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>56</b>
-                                    <v>51275</v>
+                                    <v>51278</v>
                                 </b>
                                 <b>
                                     <a>56</a>
                                     <b>3198</b>
-                                    <v>22109</v>
+                                    <v>22110</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15671,27 +15496,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>460537</v>
+                                    <v>460561</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>94553</v>
+                                    <v>94558</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>47041</v>
+                                    <v>47044</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>19</b>
-                                    <v>51275</v>
+                                    <v>51278</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>1979</b>
-                                    <v>19287</v>
+                                    <v>19288</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15707,32 +15532,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>381978</v>
+                                    <v>381998</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>91260</v>
+                                    <v>91265</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>60213</v>
+                                    <v>60216</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>9</b>
-                                    <v>51745</v>
+                                    <v>51748</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>21</b>
-                                    <v>50804</v>
+                                    <v>50807</v>
                                 </b>
                                 <b>
                                     <a>21</a>
                                     <b>1020</b>
-                                    <v>36692</v>
+                                    <v>36694</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15748,17 +15573,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4535755</v>
+                                    <v>4535991</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>550387</v>
+                                    <v>550415</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>1783</b>
-                                    <v>278956</v>
+                                    <v>278971</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15774,17 +15599,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4939842</v>
+                                    <v>4940100</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>17</b>
-                                    <v>414436</v>
+                                    <v>414458</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>1779</b>
-                                    <v>10819</v>
+                                    <v>10820</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15800,12 +15625,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5016520</v>
+                                    <v>5016782</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1561</b>
-                                    <v>348578</v>
+                                    <v>348596</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15821,7 +15646,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5360865</v>
+                                    <v>5361144</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15836,22 +15661,22 @@
         </relation>
         <relation>
             <name>var_def</name>
-            <cardinality>4083685</cardinality>
+            <cardinality>4083897</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4083685</v>
+                    <v>4083897</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>var_decl_specifiers</name>
-            <cardinality>334936</cardinality>
+            <cardinality>334953</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>334936</v>
+                    <v>334953</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -15869,7 +15694,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>334936</v>
+                                    <v>334953</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15916,19 +15741,19 @@
         </relation>
         <relation>
             <name>type_decls</name>
-            <cardinality>3283977</cardinality>
+            <cardinality>3284148</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3283977</v>
+                    <v>3284148</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>3233172</v>
+                    <v>3233340</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>3204006</v>
+                    <v>3204173</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -15942,7 +15767,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3283977</v>
+                                    <v>3284148</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15958,7 +15783,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3283977</v>
+                                    <v>3284148</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15974,12 +15799,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3191305</v>
+                                    <v>3191471</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>41867</v>
+                                    <v>41869</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15995,12 +15820,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3191305</v>
+                                    <v>3191471</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>41867</v>
+                                    <v>41869</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16016,12 +15841,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3163080</v>
+                                    <v>3163244</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>20</b>
-                                    <v>40926</v>
+                                    <v>40928</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16037,12 +15862,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3163080</v>
+                                    <v>3163244</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>20</b>
-                                    <v>40926</v>
+                                    <v>40928</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16052,33 +15877,33 @@
         </relation>
         <relation>
             <name>type_def</name>
-            <cardinality>2660675</cardinality>
+            <cardinality>2660813</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2660675</v>
+                    <v>2660813</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>type_decl_top</name>
-            <cardinality>755959</cardinality>
+            <cardinality>755998</cardinality>
             <columnsizes>
                 <e>
                     <k>type_decl</k>
-                    <v>755959</v>
+                    <v>755998</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>namespace_decls</name>
-            <cardinality>306972</cardinality>
+            <cardinality>306973</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>306972</v>
+                    <v>306973</v>
                 </e>
                 <e>
                     <k>namespace_id</k>
@@ -16086,11 +15911,11 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>306972</v>
+                    <v>306973</v>
                 </e>
                 <e>
                     <k>bodylocation</k>
-                    <v>306972</v>
+                    <v>306973</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16104,7 +15929,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>306972</v>
+                                    <v>306973</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16120,7 +15945,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>306972</v>
+                                    <v>306973</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16136,7 +15961,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>306972</v>
+                                    <v>306973</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16350,7 +16175,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>306972</v>
+                                    <v>306973</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16366,7 +16191,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>306972</v>
+                                    <v>306973</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16382,7 +16207,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>306972</v>
+                                    <v>306973</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16398,7 +16223,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>306972</v>
+                                    <v>306973</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16414,7 +16239,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>306972</v>
+                                    <v>306973</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16430,7 +16255,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>306972</v>
+                                    <v>306973</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16440,19 +16265,19 @@
         </relation>
         <relation>
             <name>usings</name>
-            <cardinality>374921</cardinality>
+            <cardinality>374941</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>374921</v>
+                    <v>374941</v>
                 </e>
                 <e>
                     <k>element_id</k>
-                    <v>318471</v>
+                    <v>318488</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>249791</v>
+                    <v>249804</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16466,7 +16291,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>374921</v>
+                                    <v>374941</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16482,7 +16307,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>374921</v>
+                                    <v>374941</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16498,12 +16323,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>263903</v>
+                                    <v>263917</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>53157</v>
+                                    <v>53159</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -16524,12 +16349,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>263903</v>
+                                    <v>263917</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>53157</v>
+                                    <v>53159</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -16550,22 +16375,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>203690</v>
+                                    <v>203700</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>11289</v>
+                                    <v>11290</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>31517</v>
+                                    <v>31519</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>11</b>
-                                    <v>3292</v>
+                                    <v>3293</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16581,22 +16406,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>203690</v>
+                                    <v>203700</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>11289</v>
+                                    <v>11290</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>31517</v>
+                                    <v>31519</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>11</b>
-                                    <v>3292</v>
+                                    <v>3293</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16606,15 +16431,15 @@
         </relation>
         <relation>
             <name>using_container</name>
-            <cardinality>478195</cardinality>
+            <cardinality>478100</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>11298</v>
+                    <v>11296</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>303207</v>
+                    <v>303147</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16684,17 +16509,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>223629</v>
+                                    <v>223585</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>52990</v>
+                                    <v>52979</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>11</b>
-                                    <v>24401</v>
+                                    <v>24396</v>
                                 </b>
                                 <b>
                                     <a>13</a>
@@ -16709,15 +16534,15 @@
         </relation>
         <relation>
             <name>static_asserts</name>
-            <cardinality>130417</cardinality>
+            <cardinality>130418</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>130417</v>
+                    <v>130418</v>
                 </e>
                 <e>
                     <k>condition</k>
-                    <v>130417</v>
+                    <v>130418</v>
                 </e>
                 <e>
                     <k>message</k>
@@ -16743,7 +16568,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>130417</v>
+                                    <v>130418</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16759,7 +16584,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>130417</v>
+                                    <v>130418</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16775,7 +16600,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>130417</v>
+                                    <v>130418</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16791,7 +16616,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>130417</v>
+                                    <v>130418</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16807,7 +16632,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>130417</v>
+                                    <v>130418</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16823,7 +16648,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>130417</v>
+                                    <v>130418</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16839,7 +16664,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>130417</v>
+                                    <v>130418</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16855,7 +16680,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>130417</v>
+                                    <v>130418</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17327,15 +17152,15 @@
         </relation>
         <relation>
             <name>params</name>
-            <cardinality>6825742</cardinality>
+            <cardinality>6826097</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6660155</v>
+                    <v>6660502</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>3940208</v>
+                    <v>3940413</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -17343,7 +17168,7 @@
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>2234478</v>
+                    <v>2234594</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -17357,7 +17182,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6660155</v>
+                                    <v>6660502</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17373,7 +17198,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6660155</v>
+                                    <v>6660502</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17389,12 +17214,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6535025</v>
+                                    <v>6535365</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>125130</v>
+                                    <v>125137</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17410,22 +17235,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2303158</v>
+                                    <v>2303278</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>960590</v>
+                                    <v>960640</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>433253</v>
+                                    <v>433276</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>18</b>
-                                    <v>243205</v>
+                                    <v>243217</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17441,22 +17266,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2303158</v>
+                                    <v>2303278</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>960590</v>
+                                    <v>960640</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>433253</v>
+                                    <v>433276</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>18</b>
-                                    <v>243205</v>
+                                    <v>243217</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17472,22 +17297,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2605636</v>
+                                    <v>2605772</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>831225</v>
+                                    <v>831269</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>349519</v>
+                                    <v>349537</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>153826</v>
+                                    <v>153834</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17741,22 +17566,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1525560</v>
+                                    <v>1525639</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>446425</v>
+                                    <v>446448</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>171701</v>
+                                    <v>171710</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>522</b>
-                                    <v>90790</v>
+                                    <v>90795</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17772,22 +17597,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1749008</v>
+                                    <v>1749099</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>250731</v>
+                                    <v>250745</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>169820</v>
+                                    <v>169829</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>506</b>
-                                    <v>64917</v>
+                                    <v>64920</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17803,17 +17628,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1801694</v>
+                                    <v>1801788</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>353282</v>
+                                    <v>353301</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>13</b>
-                                    <v>79500</v>
+                                    <v>79504</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17823,7 +17648,7 @@
         </relation>
         <relation>
             <name>overrides</name>
-            <cardinality>159823</cardinality>
+            <cardinality>159824</cardinality>
             <columnsizes>
                 <e>
                     <k>new</k>
@@ -17919,7 +17744,7 @@
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>326293</v>
+                    <v>326294</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -17937,7 +17762,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1048372</v>
+                                    <v>1048373</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18087,19 +17912,19 @@
         </relation>
         <relation>
             <name>globalvariables</name>
-            <cardinality>300716</cardinality>
+            <cardinality>318724</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>300708</v>
+                    <v>318724</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1405</v>
+                    <v>7852</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>294738</v>
+                    <v>86905</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18113,12 +17938,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>300700</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>8</v>
+                                    <v>318724</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18134,7 +17954,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>300708</v>
+                                    <v>318724</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18150,27 +17970,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>977</v>
+                                    <v>5130</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>159</v>
+                                    <v>209</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>7</b>
-                                    <v>114</v>
+                                    <b>4</b>
+                                    <v>628</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>77</b>
-                                    <v>106</v>
+                                    <a>4</a>
+                                    <b>9</b>
+                                    <v>628</v>
                                 </b>
                                 <b>
-                                    <a>83</a>
-                                    <b>169397</b>
-                                    <v>49</v>
+                                    <a>18</a>
+                                    <b>31</b>
+                                    <v>628</v>
+                                </b>
+                                <b>
+                                    <a>35</a>
+                                    <b>1226</b>
+                                    <v>628</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18186,27 +18011,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1010</v>
+                                    <v>5130</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>135</v>
+                                    <v>209</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>7</b>
-                                    <v>112</v>
+                                    <b>4</b>
+                                    <v>628</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>105</b>
-                                    <v>106</v>
+                                    <a>4</a>
+                                    <b>9</b>
+                                    <v>628</v>
                                 </b>
                                 <b>
-                                    <a>106</a>
-                                    <b>168448</b>
-                                    <v>42</v>
+                                    <a>14</a>
+                                    <b>25</b>
+                                    <v>628</v>
+                                </b>
+                                <b>
+                                    <a>35</a>
+                                    <b>209</b>
+                                    <v>628</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18222,12 +18052,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>290989</v>
+                                    <v>75911</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>33</b>
-                                    <v>3749</v>
+                                    <b>11</b>
+                                    <v>6596</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>449</b>
+                                    <v>4397</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18243,12 +18078,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>294142</v>
+                                    <v>76644</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>12</b>
-                                    <v>596</v>
+                                    <b>3</b>
+                                    <v>10261</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18266,7 +18101,7 @@
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>37905</v>
+                    <v>37909</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -18326,7 +18161,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2479</v>
+                                    <v>2483</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -18336,12 +18171,12 @@
                                 <b>
                                     <a>7</a>
                                     <b>18</b>
-                                    <v>2878</v>
+                                    <v>2874</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>15847</b>
-                                    <v>2513</v>
+                                    <v>2517</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18367,7 +18202,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>2946</v>
+                                    <v>2950</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -18449,11 +18284,11 @@
         </relation>
         <relation>
             <name>autoderivation</name>
-            <cardinality>149488</cardinality>
+            <cardinality>149519</cardinality>
             <columnsizes>
                 <e>
                     <k>var</k>
-                    <v>149488</v>
+                    <v>149519</v>
                 </e>
                 <e>
                     <k>derivation_type</k>
@@ -18471,7 +18306,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>149488</v>
+                                    <v>149519</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18537,7 +18372,7 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>240334</v>
+                    <v>240335</v>
                 </e>
                 <e>
                     <k>location</k>
@@ -19272,7 +19107,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>240334</v>
+                                    <v>240335</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19288,7 +19123,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>240334</v>
+                                    <v>240335</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19414,23 +19249,23 @@
         </relation>
         <relation>
             <name>builtintypes</name>
-            <cardinality>22109</cardinality>
+            <cardinality>22110</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>22109</v>
+                    <v>22110</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>22109</v>
+                    <v>22110</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>22109</v>
+                    <v>22110</v>
                 </e>
                 <e>
                     <k>size</k>
-                    <v>3292</v>
+                    <v>3293</v>
                 </e>
                 <e>
                     <k>sign</k>
@@ -19452,7 +19287,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22109</v>
+                                    <v>22110</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19468,7 +19303,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22109</v>
+                                    <v>22110</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19484,7 +19319,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22109</v>
+                                    <v>22110</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19500,7 +19335,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22109</v>
+                                    <v>22110</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19516,7 +19351,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22109</v>
+                                    <v>22110</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19532,7 +19367,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22109</v>
+                                    <v>22110</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19548,7 +19383,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22109</v>
+                                    <v>22110</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19564,7 +19399,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22109</v>
+                                    <v>22110</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19580,7 +19415,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22109</v>
+                                    <v>22110</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19596,7 +19431,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22109</v>
+                                    <v>22110</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19612,7 +19447,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22109</v>
+                                    <v>22110</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19628,7 +19463,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22109</v>
+                                    <v>22110</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19644,7 +19479,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22109</v>
+                                    <v>22110</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19660,7 +19495,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22109</v>
+                                    <v>22110</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19676,7 +19511,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22109</v>
+                                    <v>22110</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20126,15 +19961,15 @@
         </relation>
         <relation>
             <name>derivedtypes</name>
-            <cardinality>4413446</cardinality>
+            <cardinality>4413676</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4413446</v>
+                    <v>4413676</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>2205312</v>
+                    <v>2205427</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -20142,7 +19977,7 @@
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>2729356</v>
+                    <v>2729498</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20156,7 +19991,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4413446</v>
+                                    <v>4413676</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20172,7 +20007,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4413446</v>
+                                    <v>4413676</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20188,7 +20023,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4413446</v>
+                                    <v>4413676</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20204,17 +20039,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1935763</v>
+                                    <v>1935864</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>171231</v>
+                                    <v>171240</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>1173</b>
-                                    <v>98317</v>
+                                    <v>98322</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20230,7 +20065,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2204371</v>
+                                    <v>2204486</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20251,17 +20086,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1935763</v>
+                                    <v>1935864</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>171231</v>
+                                    <v>171240</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>1155</b>
-                                    <v>98317</v>
+                                    <v>98322</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20400,22 +20235,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1685972</v>
+                                    <v>1686060</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>568733</v>
+                                    <v>568763</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>367395</v>
+                                    <v>367414</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>54</b>
-                                    <v>107254</v>
+                                    <v>107260</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20431,22 +20266,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1697262</v>
+                                    <v>1697350</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>561206</v>
+                                    <v>561236</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>364572</v>
+                                    <v>364591</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>54</b>
-                                    <v>106314</v>
+                                    <v>106319</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20462,22 +20297,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1690206</v>
+                                    <v>1690294</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>572496</v>
+                                    <v>572526</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>366454</v>
+                                    <v>366473</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>100198</v>
+                                    <v>100203</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20487,11 +20322,11 @@
         </relation>
         <relation>
             <name>pointerishsize</name>
-            <cardinality>3314342</cardinality>
+            <cardinality>3312399</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3314342</v>
+                    <v>3312399</v>
                 </e>
                 <e>
                     <k>size</k>
@@ -20513,7 +20348,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3314342</v>
+                                    <v>3312399</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20529,7 +20364,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3314342</v>
+                                    <v>3312399</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20603,19 +20438,19 @@
         </relation>
         <relation>
             <name>arraysizes</name>
-            <cardinality>71503</cardinality>
+            <cardinality>71507</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>71503</v>
+                    <v>71507</v>
                 </e>
                 <e>
                     <k>num_elements</k>
-                    <v>23520</v>
+                    <v>23522</v>
                 </e>
                 <e>
                     <k>bytesize</k>
-                    <v>26343</v>
+                    <v>26344</v>
                 </e>
                 <e>
                     <k>alignment</k>
@@ -20633,7 +20468,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>71503</v>
+                                    <v>71507</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20649,7 +20484,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>71503</v>
+                                    <v>71507</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20665,7 +20500,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>71503</v>
+                                    <v>71507</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20686,7 +20521,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>15053</v>
+                                    <v>15054</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -20722,7 +20557,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18346</v>
+                                    <v>18347</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20753,7 +20588,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18346</v>
+                                    <v>18347</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20789,12 +20624,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>16934</v>
+                                    <v>16935</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>3292</v>
+                                    <v>3293</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -20820,12 +20655,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21639</v>
+                                    <v>21640</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3292</v>
+                                    <v>3293</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -20846,12 +20681,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22109</v>
+                                    <v>22110</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3292</v>
+                                    <v>3293</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -20954,15 +20789,15 @@
         </relation>
         <relation>
             <name>typedefbase</name>
-            <cardinality>1724181</cardinality>
+            <cardinality>1736730</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1724181</v>
+                    <v>1736730</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>803746</v>
+                    <v>810523</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20976,7 +20811,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1724181</v>
+                                    <v>1736730</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20992,22 +20827,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>623380</v>
+                                    <v>629130</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>84307</v>
+                                    <v>85019</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>64497</v>
+                                    <v>64576</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>5443</b>
-                                    <v>31560</v>
+                                    <v>31797</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21017,19 +20852,19 @@
         </relation>
         <relation>
             <name>decltypes</name>
-            <cardinality>355640</cardinality>
+            <cardinality>355894</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>23953</v>
+                    <v>23951</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>355640</v>
+                    <v>355894</v>
                 </e>
                 <e>
                     <k>base_type</k>
-                    <v>17181</v>
+                    <v>17180</v>
                 </e>
                 <e>
                     <k>parentheses_would_change_meaning</k>
@@ -21047,12 +20882,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5961</v>
+                                    <v>5960</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7492</v>
+                                    <v>7491</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -21067,12 +20902,12 @@
                                 <b>
                                     <a>7</a>
                                     <b>18</b>
-                                    <v>1999</v>
+                                    <v>1980</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>42</b>
-                                    <v>2017</v>
+                                    <v>2035</v>
                                 </b>
                                 <b>
                                     <a>42</a>
@@ -21093,7 +20928,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>23953</v>
+                                    <v>23951</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21109,7 +20944,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>23953</v>
+                                    <v>23951</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21125,7 +20960,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>355640</v>
+                                    <v>355894</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21141,7 +20976,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>355640</v>
+                                    <v>355894</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21157,7 +20992,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>355640</v>
+                                    <v>355894</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21204,7 +21039,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7348</v>
+                                    <v>7347</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -21245,7 +21080,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17181</v>
+                                    <v>17180</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21275,8 +21110,8 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>19747</a>
-                                    <b>19748</b>
+                                    <a>19762</a>
+                                    <b>19763</b>
                                     <v>18</v>
                                 </b>
                             </bs>
@@ -21303,15 +21138,15 @@
         </relation>
         <relation>
             <name>usertypes</name>
-            <cardinality>5342989</cardinality>
+            <cardinality>5343268</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5342989</v>
+                    <v>5343268</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1383024</v>
+                    <v>1383096</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -21329,7 +21164,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5342989</v>
+                                    <v>5343268</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21345,7 +21180,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5342989</v>
+                                    <v>5343268</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21361,27 +21196,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1001986</v>
+                                    <v>1002039</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>161352</v>
+                                    <v>161361</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>107725</v>
+                                    <v>107730</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>80</b>
-                                    <v>104432</v>
+                                    <v>104437</v>
                                 </b>
                                 <b>
                                     <a>80</a>
                                     <b>885</b>
-                                    <v>7526</v>
+                                    <v>7527</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21397,17 +21232,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1240488</v>
+                                    <v>1240552</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>127012</v>
+                                    <v>127019</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>15523</v>
+                                    <v>15524</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21549,11 +21384,11 @@
         </relation>
         <relation>
             <name>usertypesize</name>
-            <cardinality>1755594</cardinality>
+            <cardinality>1755685</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1755594</v>
+                    <v>1755685</v>
                 </e>
                 <e>
                     <k>size</k>
@@ -21575,7 +21410,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1755594</v>
+                                    <v>1755685</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21591,7 +21426,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1755594</v>
+                                    <v>1755685</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21607,7 +21442,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3292</v>
+                                    <v>3293</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21755,11 +21590,11 @@
         </relation>
         <relation>
             <name>usertype_final</name>
-            <cardinality>9526</cardinality>
+            <cardinality>9528</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9526</v>
+                    <v>9528</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -21819,15 +21654,15 @@
         </relation>
         <relation>
             <name>mangled_name</name>
-            <cardinality>5264430</cardinality>
+            <cardinality>5301398</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5264430</v>
+                    <v>5301398</v>
                 </e>
                 <e>
                     <k>mangled_name</k>
-                    <v>1235313</v>
+                    <v>1272072</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21841,7 +21676,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5264430</v>
+                                    <v>5301398</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21857,32 +21692,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>731027</v>
+                                    <v>767759</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>178287</v>
+                                    <v>178297</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>84674</v>
+                                    <v>84679</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>6</b>
-                                    <v>86086</v>
+                                    <b>7</b>
+                                    <v>114787</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>13</b>
-                                    <v>93142</v>
+                                    <a>7</a>
+                                    <b>25</b>
+                                    <v>95499</v>
                                 </b>
                                 <b>
-                                    <a>13</a>
+                                    <a>25</a>
                                     <b>885</b>
-                                    <v>62094</v>
+                                    <v>31049</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21892,59 +21727,59 @@
         </relation>
         <relation>
             <name>is_pod_class</name>
-            <cardinality>554326</cardinality>
+            <cardinality>554216</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>554326</v>
+                    <v>554216</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_standard_layout_class</name>
-            <cardinality>1295997</cardinality>
+            <cardinality>1296064</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1295997</v>
+                    <v>1296064</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_complete</name>
-            <cardinality>1694439</cardinality>
+            <cardinality>1694528</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1694439</v>
+                    <v>1694528</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_class_template</name>
-            <cardinality>405028</cardinality>
+            <cardinality>405049</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>405028</v>
+                    <v>405049</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>class_instantiation</name>
-            <cardinality>1121943</cardinality>
+            <cardinality>1122001</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>1121943</v>
+                    <v>1122001</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>170761</v>
+                    <v>170770</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21958,7 +21793,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1121943</v>
+                                    <v>1122001</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21974,42 +21809,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>58802</v>
+                                    <v>58805</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>30106</v>
+                                    <v>30108</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>16464</v>
+                                    <v>16465</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>14582</v>
+                                    <v>14583</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>15523</v>
+                                    <v>15524</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>13</b>
-                                    <v>13171</v>
+                                    <v>13172</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>29</b>
-                                    <v>13171</v>
+                                    <v>13172</v>
                                 </b>
                                 <b>
                                     <a>30</a>
                                     <b>84</b>
-                                    <v>8937</v>
+                                    <v>8938</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22019,11 +21854,11 @@
         </relation>
         <relation>
             <name>class_template_argument</name>
-            <cardinality>2978113</cardinality>
+            <cardinality>2977520</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>1355713</v>
+                    <v>1355443</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -22031,7 +21866,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>863386</v>
+                    <v>863214</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22045,27 +21880,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>551562</v>
+                                    <v>551453</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>411593</v>
+                                    <v>411511</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>246019</v>
+                                    <v>245970</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>122356</v>
+                                    <v>122331</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>113</b>
-                                    <v>24182</v>
+                                    <v>24177</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22081,22 +21916,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>577421</v>
+                                    <v>577306</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>424939</v>
+                                    <v>424854</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>257884</v>
+                                    <v>257833</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>113</b>
-                                    <v>95467</v>
+                                    <v>95448</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22117,7 +21952,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>821</v>
+                                    <v>820</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -22163,7 +21998,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>821</v>
+                                    <v>820</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -22204,27 +22039,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>535649</v>
+                                    <v>535542</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>181070</v>
+                                    <v>181034</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>52573</v>
+                                    <v>52563</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>10</b>
-                                    <v>65688</v>
+                                    <v>65675</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11334</b>
-                                    <v>28403</v>
+                                    <v>28397</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22240,17 +22075,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>755682</v>
+                                    <v>755532</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>85741</v>
+                                    <v>85724</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>22</b>
-                                    <v>21961</v>
+                                    <v>21957</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22260,11 +22095,11 @@
         </relation>
         <relation>
             <name>class_template_argument_value</name>
-            <cardinality>508520</cardinality>
+            <cardinality>508546</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>316590</v>
+                    <v>316606</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -22272,7 +22107,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>508520</v>
+                    <v>508546</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22286,12 +22121,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>261081</v>
+                                    <v>261094</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>53627</v>
+                                    <v>53630</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -22312,17 +22147,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>200397</v>
+                                    <v>200407</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>81852</v>
+                                    <v>81856</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>29165</v>
+                                    <v>29167</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -22405,7 +22240,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>508520</v>
+                                    <v>508546</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22421,7 +22256,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>508520</v>
+                                    <v>508546</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22431,15 +22266,15 @@
         </relation>
         <relation>
             <name>is_proxy_class_for</name>
-            <cardinality>65387</cardinality>
+            <cardinality>65391</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>65387</v>
+                    <v>65391</v>
                 </e>
                 <e>
                     <k>templ_param_id</k>
-                    <v>65387</v>
+                    <v>65391</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22453,7 +22288,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>65387</v>
+                                    <v>65391</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22469,7 +22304,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>65387</v>
+                                    <v>65391</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22479,11 +22314,11 @@
         </relation>
         <relation>
             <name>type_mentions</name>
-            <cardinality>4011508</cardinality>
+            <cardinality>4011511</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4011508</v>
+                    <v>4011511</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -22491,7 +22326,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>3978135</v>
+                    <v>3978138</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -22509,7 +22344,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4011508</v>
+                                    <v>4011511</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22525,7 +22360,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4011508</v>
+                                    <v>4011511</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22541,7 +22376,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4011508</v>
+                                    <v>4011511</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22675,7 +22510,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3944762</v>
+                                    <v>3944765</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22696,7 +22531,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3944762</v>
+                                    <v>3944765</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22717,7 +22552,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3978135</v>
+                                    <v>3978138</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22775,26 +22610,26 @@
         </relation>
         <relation>
             <name>is_function_template</name>
-            <cardinality>1413601</cardinality>
+            <cardinality>1413674</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1413601</v>
+                    <v>1413674</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_instantiation</name>
-            <cardinality>906422</cardinality>
+            <cardinality>905891</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>906422</v>
+                    <v>905891</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>146002</v>
+                    <v>145917</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22808,7 +22643,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>906422</v>
+                                    <v>905891</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22824,27 +22659,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>101152</v>
+                                    <v>101092</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>14480</v>
+                                    <v>14472</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>12014</v>
+                                    <v>12007</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>21</b>
-                                    <v>12049</v>
+                                    <v>12042</v>
                                 </b>
                                 <b>
                                     <a>22</a>
                                     <b>869</b>
-                                    <v>6306</v>
+                                    <v>6302</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22854,11 +22689,11 @@
         </relation>
         <relation>
             <name>function_template_argument</name>
-            <cardinality>2339815</cardinality>
+            <cardinality>2338443</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
-                    <v>1318394</v>
+                    <v>1317621</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -22866,7 +22701,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>305041</v>
+                    <v>304862</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22880,22 +22715,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>679667</v>
+                                    <v>679268</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>388084</v>
+                                    <v>387856</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>179966</v>
+                                    <v>179861</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>15</b>
-                                    <v>70676</v>
+                                    <v>70634</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22911,22 +22746,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>694852</v>
+                                    <v>694445</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>393404</v>
+                                    <v>393173</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>150970</v>
+                                    <v>150882</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>79167</v>
+                                    <v>79120</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23074,32 +22909,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>186978</v>
+                                    <v>186868</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>44850</v>
+                                    <v>44824</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>23218</v>
+                                    <v>23204</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>16</b>
-                                    <v>23535</v>
+                                    <v>23521</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>107</b>
-                                    <v>23006</v>
+                                    <v>22993</v>
                                 </b>
                                 <b>
                                     <a>108</a>
                                     <b>955</b>
-                                    <v>3452</v>
+                                    <v>3450</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23115,17 +22950,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>274918</v>
+                                    <v>274756</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>26001</v>
+                                    <v>25986</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>17</b>
-                                    <v>4122</v>
+                                    <v>4119</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23135,11 +22970,11 @@
         </relation>
         <relation>
             <name>function_template_argument_value</name>
-            <cardinality>362998</cardinality>
+            <cardinality>362786</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
-                    <v>181340</v>
+                    <v>181234</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -23147,7 +22982,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>360356</v>
+                    <v>360145</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23161,12 +22996,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>171969</v>
+                                    <v>171868</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>9371</v>
+                                    <v>9366</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23182,17 +23017,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>151428</v>
+                                    <v>151339</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>20681</v>
+                                    <v>20669</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>97</b>
-                                    <v>9230</v>
+                                    <v>9225</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23330,12 +23165,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>357714</v>
+                                    <v>357504</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2642</v>
+                                    <v>2640</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23351,7 +23186,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>360356</v>
+                                    <v>360145</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23361,26 +23196,26 @@
         </relation>
         <relation>
             <name>is_variable_template</name>
-            <cardinality>42082</cardinality>
+            <cardinality>47326</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>42082</v>
+                    <v>47326</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>variable_instantiation</name>
-            <cardinality>49201</cardinality>
+            <cardinality>258309</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>49201</v>
+                    <v>258309</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>25019</v>
+                    <v>26281</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23394,7 +23229,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>49201</v>
+                                    <v>258309</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23410,22 +23245,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14236</v>
+                                    <v>11203</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7746</v>
+                                    <v>3559</v>
                                 </b>
                                 <b>
                                     <a>3</a>
+                                    <b>4</b>
+                                    <v>1675</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>1884</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
                                     <b>8</b>
-                                    <v>1988</v>
+                                    <v>1884</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>14</b>
-                                    <v>1046</v>
+                                    <v>2408</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>26</b>
+                                    <v>1989</v>
+                                </b>
+                                <b>
+                                    <a>32</a>
+                                    <b>371</b>
+                                    <v>1675</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23435,11 +23290,11 @@
         </relation>
         <relation>
             <name>variable_template_argument</name>
-            <cardinality>329648</cardinality>
+            <cardinality>448035</cardinality>
             <columnsizes>
                 <e>
                     <k>variable_id</k>
-                    <v>26380</v>
+                    <v>247943</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -23447,7 +23302,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>217532</v>
+                    <v>217578</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23461,22 +23316,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16121</v>
+                                    <v>119469</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5652</v>
+                                    <v>99889</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>3873</v>
+                                    <v>18218</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>17</b>
-                                    <v>732</v>
+                                    <v>10365</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23492,52 +23347,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5757</v>
+                                    <v>129206</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5234</v>
+                                    <v>91408</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>4</b>
-                                    <v>2093</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
                                     <b>5</b>
-                                    <v>1256</v>
+                                    <v>22825</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>6</b>
-                                    <v>2407</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>8</b>
-                                    <v>2303</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>11</b>
-                                    <v>2198</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>18</b>
-                                    <v>2303</v>
-                                </b>
-                                <b>
-                                    <a>18</a>
-                                    <b>50</b>
-                                    <v>1988</v>
-                                </b>
-                                <b>
-                                    <a>66</a>
-                                    <b>516</b>
-                                    <v>837</v>
+                                    <b>17</b>
+                                    <v>4502</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23551,43 +23376,53 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1</a>
-                                    <b>2</b>
+                                    <a>11</a>
+                                    <b>12</b>
                                     <v>104</v>
                                 </b>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
+                                    <a>22</a>
+                                    <b>23</b>
                                     <v>628</v>
                                 </b>
                                 <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>418</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>209</v>
-                                </b>
-                                <b>
-                                    <a>27</a>
-                                    <b>28</b>
+                                    <a>29</a>
+                                    <b>30</b>
                                     <v>104</v>
                                 </b>
                                 <b>
-                                    <a>42</a>
-                                    <b>43</b>
+                                    <a>30</a>
+                                    <b>31</b>
+                                    <v>314</v>
+                                </b>
+                                <b>
+                                    <a>44</a>
+                                    <b>45</b>
                                     <v>104</v>
                                 </b>
                                 <b>
-                                    <a>79</a>
-                                    <b>80</b>
+                                    <a>93</a>
+                                    <b>94</b>
                                     <v>104</v>
                                 </b>
                                 <b>
-                                    <a>248</a>
-                                    <b>249</b>
+                                    <a>222</a>
+                                    <b>223</b>
+                                    <v>104</v>
+                                </b>
+                                <b>
+                                    <a>588</a>
+                                    <b>589</b>
+                                    <v>104</v>
+                                </b>
+                                <b>
+                                    <a>1090</a>
+                                    <b>1091</b>
+                                    <v>104</v>
+                                </b>
+                                <b>
+                                    <a>1974</a>
+                                    <b>1975</b>
                                     <v>104</v>
                                 </b>
                             </bs>
@@ -23665,17 +23500,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>180579</v>
+                                    <v>171403</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>21878</v>
+                                    <v>25024</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>38</b>
-                                    <v>15074</v>
+                                    <b>8</b>
+                                    <v>17067</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>94</b>
+                                    <v>4083</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23691,12 +23531,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>200259</v>
+                                    <v>200302</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>16854</v>
+                                    <v>16857</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -23711,11 +23551,11 @@
         </relation>
         <relation>
             <name>variable_template_argument_value</name>
-            <cardinality>15597</cardinality>
+            <cardinality>15810</cardinality>
             <columnsizes>
                 <e>
                     <k>variable_id</k>
-                    <v>2826</v>
+                    <v>6596</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -23723,7 +23563,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>12038</v>
+                    <v>12041</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23737,12 +23577,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2617</v>
+                                    <v>5968</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>209</v>
+                                    <v>628</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23756,45 +23596,25 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>418</v>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>314</v>
                                 </b>
                                 <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>104</v>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>5235</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1360</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>209</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>209</v>
+                                    <v>837</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
                                     <v>209</v>
                                 </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>17</b>
-                                    <v>209</v>
-                                </b>
-                                <b>
-                                    <a>20</a>
-                                    <b>21</b>
-                                    <v>104</v>
-                                </b>
                             </bs>
                         </hist>
                     </val>
@@ -23806,24 +23626,24 @@
                         <hist>
                             <budget>12</budget>
                             <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>104</v>
-                                </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
                                     <v>104</v>
                                 </b>
                                 <b>
-                                    <a>8</a>
-                                    <b>9</b>
+                                    <a>19</a>
+                                    <b>20</b>
                                     <v>104</v>
                                 </b>
                                 <b>
-                                    <a>13</a>
-                                    <b>14</b>
+                                    <a>20</a>
+                                    <b>21</b>
+                                    <v>104</v>
+                                </b>
+                                <b>
+                                    <a>24</a>
+                                    <b>25</b>
                                     <v>104</v>
                                 </b>
                             </bs>
@@ -23871,12 +23691,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8479</v>
+                                    <v>8271</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3559</v>
+                                    <v>3769</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23892,7 +23712,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12038</v>
+                                    <v>12041</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23902,15 +23722,15 @@
         </relation>
         <relation>
             <name>routinetypes</name>
-            <cardinality>546982</cardinality>
+            <cardinality>546661</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>546982</v>
+                    <v>546661</v>
                 </e>
                 <e>
                     <k>return_type</k>
-                    <v>285945</v>
+                    <v>285778</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23924,7 +23744,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>546982</v>
+                                    <v>546661</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23940,17 +23760,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>249233</v>
+                                    <v>249087</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>21315</v>
+                                    <v>21303</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>3594</b>
-                                    <v>15396</v>
+                                    <v>15387</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23960,11 +23780,11 @@
         </relation>
         <relation>
             <name>routinetypeargs</name>
-            <cardinality>993519</cardinality>
+            <cardinality>993571</cardinality>
             <columnsizes>
                 <e>
                     <k>routine</k>
-                    <v>429019</v>
+                    <v>429042</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -23972,7 +23792,7 @@
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>229563</v>
+                    <v>229575</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23986,27 +23806,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>155707</v>
+                                    <v>155715</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>135479</v>
+                                    <v>135486</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>63976</v>
+                                    <v>63979</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>46100</v>
+                                    <v>46103</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>18</b>
-                                    <v>27754</v>
+                                    <v>27756</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24022,27 +23842,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>185814</v>
+                                    <v>185824</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>135009</v>
+                                    <v>135016</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>59272</v>
+                                    <v>59275</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>33869</v>
+                                    <v>33871</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>11</b>
-                                    <v>15053</v>
+                                    <v>15054</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24200,27 +24020,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>148651</v>
+                                    <v>148659</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>31047</v>
+                                    <v>31049</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>16934</v>
+                                    <v>16935</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>12</b>
-                                    <v>18346</v>
+                                    <v>18347</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>113</b>
-                                    <v>14582</v>
+                                    <v>14583</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24236,17 +24056,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>174994</v>
+                                    <v>175004</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>31047</v>
+                                    <v>31049</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>18816</v>
+                                    <v>18817</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -24261,19 +24081,19 @@
         </relation>
         <relation>
             <name>ptrtomembers</name>
-            <cardinality>38103</cardinality>
+            <cardinality>38105</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>38103</v>
+                    <v>38105</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>38103</v>
+                    <v>38105</v>
                 </e>
                 <e>
                     <k>class_id</k>
-                    <v>15523</v>
+                    <v>15524</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24287,7 +24107,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>38103</v>
+                                    <v>38105</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24303,7 +24123,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>38103</v>
+                                    <v>38105</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24319,7 +24139,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>38103</v>
+                                    <v>38105</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24335,7 +24155,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>38103</v>
+                                    <v>38105</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24397,15 +24217,15 @@
         </relation>
         <relation>
             <name>specifiers</name>
-            <cardinality>24932</cardinality>
+            <cardinality>24933</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>24932</v>
+                    <v>24933</v>
                 </e>
                 <e>
                     <k>str</k>
-                    <v>24932</v>
+                    <v>24933</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24419,7 +24239,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>24932</v>
+                                    <v>24933</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24435,7 +24255,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>24932</v>
+                                    <v>24933</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24445,11 +24265,11 @@
         </relation>
         <relation>
             <name>typespecifiers</name>
-            <cardinality>1317166</cardinality>
+            <cardinality>1317234</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>1298819</v>
+                    <v>1298887</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -24467,12 +24287,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1280473</v>
+                                    <v>1280540</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>18346</v>
+                                    <v>18347</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24533,11 +24353,11 @@
         </relation>
         <relation>
             <name>funspecifiers</name>
-            <cardinality>13049498</cardinality>
+            <cardinality>13041848</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>3975160</v>
+                    <v>3972829</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -24555,27 +24375,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>314977</v>
+                                    <v>314792</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>544551</v>
+                                    <v>544231</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1145438</v>
+                                    <v>1144767</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1732127</v>
+                                    <v>1731112</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>238064</v>
+                                    <v>237925</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24691,11 +24511,11 @@
         </relation>
         <relation>
             <name>varspecifiers</name>
-            <cardinality>2347848</cardinality>
+            <cardinality>2347970</cardinality>
             <columnsizes>
                 <e>
                     <k>var_id</k>
-                    <v>1255071</v>
+                    <v>1255136</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -24713,22 +24533,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>735731</v>
+                                    <v>735769</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>203219</v>
+                                    <v>203230</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>58802</v>
+                                    <v>58805</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>257317</v>
+                                    <v>257331</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24789,11 +24609,11 @@
         </relation>
         <relation>
             <name>attributes</name>
-            <cardinality>696354</cardinality>
+            <cardinality>696502</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>696354</v>
+                    <v>696502</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -24801,7 +24621,7 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1674</v>
+                    <v>1675</v>
                 </e>
                 <e>
                     <k>name_space</k>
@@ -24809,7 +24629,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>483847</v>
+                    <v>483949</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24823,7 +24643,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>696354</v>
+                                    <v>696502</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24839,7 +24659,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>696354</v>
+                                    <v>696502</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24855,7 +24675,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>696354</v>
+                                    <v>696502</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24871,7 +24691,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>696354</v>
+                                    <v>696502</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25088,7 +24908,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1674</v>
+                                    <v>1675</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25264,17 +25084,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>442497</v>
+                                    <v>442591</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>9</b>
-                                    <v>36848</v>
+                                    <v>36856</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>201</b>
-                                    <v>4501</v>
+                                    <v>4502</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25290,7 +25110,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>483847</v>
+                                    <v>483949</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25306,7 +25126,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>479555</v>
+                                    <v>479656</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25327,7 +25147,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>483847</v>
+                                    <v>483949</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25337,11 +25157,11 @@
         </relation>
         <relation>
             <name>attribute_args</name>
-            <cardinality>352341</cardinality>
+            <cardinality>352360</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>352341</v>
+                    <v>352360</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -25349,7 +25169,7 @@
                 </e>
                 <e>
                     <k>attribute</k>
-                    <v>270489</v>
+                    <v>270503</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -25357,7 +25177,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>329291</v>
+                    <v>329308</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25371,7 +25191,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>352341</v>
+                                    <v>352360</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25387,7 +25207,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>352341</v>
+                                    <v>352360</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25403,7 +25223,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>352341</v>
+                                    <v>352360</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25419,7 +25239,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>352341</v>
+                                    <v>352360</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25534,12 +25354,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>204631</v>
+                                    <v>204641</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>49864</v>
+                                    <v>49866</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -25560,7 +25380,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>260140</v>
+                                    <v>260153</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25581,12 +25401,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>204631</v>
+                                    <v>204641</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>49864</v>
+                                    <v>49866</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -25607,12 +25427,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>204631</v>
+                                    <v>204641</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>49864</v>
+                                    <v>49866</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -25732,12 +25552,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>315179</v>
+                                    <v>315195</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>16</b>
-                                    <v>14112</v>
+                                    <v>14113</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25753,7 +25573,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>316590</v>
+                                    <v>316606</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25774,12 +25594,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>315179</v>
+                                    <v>315195</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>16</b>
-                                    <v>14112</v>
+                                    <v>14113</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25795,7 +25615,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>329291</v>
+                                    <v>329308</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25805,15 +25625,15 @@
         </relation>
         <relation>
             <name>attribute_arg_value</name>
-            <cardinality>351871</cardinality>
+            <cardinality>351889</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>351871</v>
+                    <v>351889</v>
                 </e>
                 <e>
                     <k>value</k>
-                    <v>34810</v>
+                    <v>34812</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25827,7 +25647,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>351871</v>
+                                    <v>351889</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25843,12 +25663,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16934</v>
+                                    <v>16935</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12230</v>
+                                    <v>12231</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -25969,15 +25789,15 @@
         </relation>
         <relation>
             <name>typeattributes</name>
-            <cardinality>62496</cardinality>
+            <cardinality>62509</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>62077</v>
+                    <v>62090</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>62496</v>
+                    <v>62509</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25991,7 +25811,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>61658</v>
+                                    <v>61671</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26012,7 +25832,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>62496</v>
+                                    <v>62509</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26022,15 +25842,15 @@
         </relation>
         <relation>
             <name>funcattributes</name>
-            <cardinality>635532</cardinality>
+            <cardinality>635565</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>447366</v>
+                    <v>447389</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>635532</v>
+                    <v>635565</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26044,17 +25864,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>341522</v>
+                                    <v>341540</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>64917</v>
+                                    <v>64920</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>39985</v>
+                                    <v>39987</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -26075,7 +25895,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>635532</v>
+                                    <v>635565</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26143,15 +25963,15 @@
         </relation>
         <relation>
             <name>stmtattributes</name>
-            <cardinality>1006</cardinality>
+            <cardinality>1005</cardinality>
             <columnsizes>
                 <e>
                     <k>stmt_id</k>
-                    <v>1006</v>
+                    <v>1005</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>1006</v>
+                    <v>1005</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26165,7 +25985,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1006</v>
+                                    <v>1005</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26181,7 +26001,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1006</v>
+                                    <v>1005</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26191,15 +26011,15 @@
         </relation>
         <relation>
             <name>unspecifiedtype</name>
-            <cardinality>10352924</cardinality>
+            <cardinality>10353463</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>10352924</v>
+                    <v>10353463</v>
                 </e>
                 <e>
                     <k>unspecified_type_id</k>
-                    <v>6956047</v>
+                    <v>6956409</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26213,7 +26033,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10352924</v>
+                                    <v>10353463</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26229,17 +26049,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4675939</v>
+                                    <v>4676182</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2037843</v>
+                                    <v>2037950</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>147</b>
-                                    <v>242264</v>
+                                    <v>242277</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26249,19 +26069,19 @@
         </relation>
         <relation>
             <name>member</name>
-            <cardinality>5134480</cardinality>
+            <cardinality>5131470</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>689567</v>
+                    <v>689163</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>8808</v>
+                    <v>8802</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>5070710</v>
+                    <v>5067737</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26275,42 +26095,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>3</b>
-                                    <v>18884</v>
+                                    <v>18873</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>390691</v>
+                                    <v>390462</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>39072</v>
+                                    <v>39049</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>53059</v>
+                                    <v>53028</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>10</b>
-                                    <v>52848</v>
+                                    <v>52817</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>16</b>
-                                    <v>57569</v>
+                                    <v>57535</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>30</b>
-                                    <v>52954</v>
+                                    <v>52923</v>
                                 </b>
                                 <b>
                                     <a>30</a>
                                     <b>251</b>
-                                    <v>24486</v>
+                                    <v>24472</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26326,42 +26146,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>3</b>
-                                    <v>18884</v>
+                                    <v>18873</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>390656</v>
+                                    <v>390427</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>39107</v>
+                                    <v>39084</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>53165</v>
+                                    <v>53134</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>10</b>
-                                    <v>53165</v>
+                                    <v>53134</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>16</b>
-                                    <v>57323</v>
+                                    <v>57289</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>29</b>
-                                    <v>52742</v>
+                                    <v>52711</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>253</b>
-                                    <v>24521</v>
+                                    <v>24507</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26377,17 +26197,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1409</v>
+                                    <v>1408</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>810</v>
+                                    <v>809</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>951</v>
+                                    <v>950</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -26448,7 +26268,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>810</v>
+                                    <v>809</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26458,7 +26278,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1162</v>
+                                    <v>1161</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -26503,7 +26323,7 @@
                                 <b>
                                     <a>2770</a>
                                     <b>19253</b>
-                                    <v>458</v>
+                                    <v>457</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26519,7 +26339,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5070710</v>
+                                    <v>5067737</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26535,12 +26355,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5008419</v>
+                                    <v>5005483</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>62290</v>
+                                    <v>62254</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26550,15 +26370,15 @@
         </relation>
         <relation>
             <name>enclosingfunction</name>
-            <cardinality>121743</cardinality>
+            <cardinality>121719</cardinality>
             <columnsizes>
                 <e>
                     <k>child</k>
-                    <v>121743</v>
+                    <v>121719</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>69504</v>
+                    <v>69490</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26572,7 +26392,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>121743</v>
+                                    <v>121719</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26588,22 +26408,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36695</v>
+                                    <v>36687</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>21591</v>
+                                    <v>21587</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6106</v>
+                                    <v>6105</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>45</b>
-                                    <v>5111</v>
+                                    <v>5110</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26613,15 +26433,15 @@
         </relation>
         <relation>
             <name>derivations</name>
-            <cardinality>402388</cardinality>
+            <cardinality>402152</cardinality>
             <columnsizes>
                 <e>
                     <k>derivation</k>
-                    <v>402388</v>
+                    <v>402152</v>
                 </e>
                 <e>
                     <k>sub</k>
-                    <v>381883</v>
+                    <v>381659</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -26629,11 +26449,11 @@
                 </e>
                 <e>
                     <k>super</k>
-                    <v>206461</v>
+                    <v>206340</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>38156</v>
+                    <v>38134</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26647,7 +26467,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>402388</v>
+                                    <v>402152</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26663,7 +26483,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>402388</v>
+                                    <v>402152</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26679,7 +26499,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>402388</v>
+                                    <v>402152</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26695,7 +26515,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>402388</v>
+                                    <v>402152</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26711,12 +26531,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>366733</v>
+                                    <v>366518</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>15149</v>
+                                    <v>15141</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26732,12 +26552,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>366733</v>
+                                    <v>366518</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>15149</v>
+                                    <v>15141</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26753,12 +26573,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>366733</v>
+                                    <v>366518</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>15149</v>
+                                    <v>15141</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26774,12 +26594,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>366733</v>
+                                    <v>366518</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>15149</v>
+                                    <v>15141</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26924,12 +26744,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>199133</v>
+                                    <v>199016</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1225</b>
-                                    <v>7328</v>
+                                    <v>7324</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26945,12 +26765,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>199133</v>
+                                    <v>199016</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1225</b>
-                                    <v>7328</v>
+                                    <v>7324</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26966,12 +26786,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>206003</v>
+                                    <v>205882</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>458</v>
+                                    <v>457</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26987,12 +26807,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>202867</v>
+                                    <v>202748</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>108</b>
-                                    <v>3593</v>
+                                    <v>3591</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27008,22 +26828,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28326</v>
+                                    <v>28310</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>3135</v>
+                                    <v>3133</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>16</b>
-                                    <v>2994</v>
+                                    <v>2992</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>133</b>
-                                    <v>2994</v>
+                                    <v>2992</v>
                                 </b>
                                 <b>
                                     <a>142</a>
@@ -27044,22 +26864,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28326</v>
+                                    <v>28310</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>3135</v>
+                                    <v>3133</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>16</b>
-                                    <v>2994</v>
+                                    <v>2992</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>133</b>
-                                    <v>2994</v>
+                                    <v>2992</v>
                                 </b>
                                 <b>
                                     <a>142</a>
@@ -27080,7 +26900,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>38156</v>
+                                    <v>38134</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27096,22 +26916,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30757</v>
+                                    <v>30739</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>3417</v>
+                                    <v>3415</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>55</b>
-                                    <v>2889</v>
+                                    <v>2887</v>
                                 </b>
                                 <b>
                                     <a>60</a>
                                     <b>420</b>
-                                    <v>1092</v>
+                                    <v>1091</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27121,11 +26941,11 @@
         </relation>
         <relation>
             <name>derspecifiers</name>
-            <cardinality>404291</cardinality>
+            <cardinality>404054</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>402001</v>
+                    <v>401765</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -27143,12 +26963,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>399710</v>
+                                    <v>399476</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2290</v>
+                                    <v>2288</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27189,11 +27009,11 @@
         </relation>
         <relation>
             <name>direct_base_offsets</name>
-            <cardinality>373110</cardinality>
+            <cardinality>372891</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>373110</v>
+                    <v>372891</v>
                 </e>
                 <e>
                     <k>offset</k>
@@ -27211,7 +27031,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>373110</v>
+                                    <v>372891</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27262,11 +27082,11 @@
         </relation>
         <relation>
             <name>virtual_base_offsets</name>
-            <cardinality>6661</cardinality>
+            <cardinality>6660</cardinality>
             <columnsizes>
                 <e>
                     <k>sub</k>
-                    <v>3677</v>
+                    <v>3676</v>
                 </e>
                 <e>
                     <k>super</k>
@@ -27288,7 +27108,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2891</v>
+                                    <v>2890</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27319,7 +27139,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3099</v>
+                                    <v>3098</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27553,23 +27373,23 @@
         </relation>
         <relation>
             <name>frienddecls</name>
-            <cardinality>715075</cardinality>
+            <cardinality>714656</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>715075</v>
+                    <v>714656</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>42384</v>
+                    <v>42359</v>
                 </e>
                 <e>
                     <k>decl_id</k>
-                    <v>70182</v>
+                    <v>70141</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>6341</v>
+                    <v>6338</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27583,7 +27403,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>715075</v>
+                                    <v>714656</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27599,7 +27419,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>715075</v>
+                                    <v>714656</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27615,7 +27435,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>715075</v>
+                                    <v>714656</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27631,47 +27451,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6200</v>
+                                    <v>6197</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>13212</v>
+                                    <v>13204</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>2959</v>
+                                    <v>2957</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>3206</v>
+                                    <v>3204</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>17</b>
-                                    <v>3276</v>
+                                    <v>3274</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>24</b>
-                                    <v>3347</v>
+                                    <v>3345</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>36</b>
-                                    <v>3311</v>
+                                    <v>3309</v>
                                 </b>
                                 <b>
                                     <a>37</a>
                                     <b>55</b>
-                                    <v>3241</v>
+                                    <v>3239</v>
                                 </b>
                                 <b>
                                     <a>55</a>
                                     <b>103</b>
-                                    <v>3628</v>
+                                    <v>3626</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27687,47 +27507,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6200</v>
+                                    <v>6197</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>13212</v>
+                                    <v>13204</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>2959</v>
+                                    <v>2957</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>3206</v>
+                                    <v>3204</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>17</b>
-                                    <v>3276</v>
+                                    <v>3274</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>24</b>
-                                    <v>3347</v>
+                                    <v>3345</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>36</b>
-                                    <v>3311</v>
+                                    <v>3309</v>
                                 </b>
                                 <b>
                                     <a>37</a>
                                     <b>55</b>
-                                    <v>3241</v>
+                                    <v>3239</v>
                                 </b>
                                 <b>
                                     <a>55</a>
                                     <b>103</b>
-                                    <v>3628</v>
+                                    <v>3626</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27743,12 +27563,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40939</v>
+                                    <v>40915</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>13</b>
-                                    <v>1444</v>
+                                    <v>1443</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27764,37 +27584,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40481</v>
+                                    <v>40458</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5883</v>
+                                    <v>5880</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>6024</v>
+                                    <v>6021</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>15</b>
-                                    <v>5425</v>
+                                    <v>5422</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>32</b>
-                                    <v>5284</v>
+                                    <v>5281</v>
                                 </b>
                                 <b>
                                     <a>32</a>
                                     <b>71</b>
-                                    <v>5284</v>
+                                    <v>5281</v>
                                 </b>
                                 <b>
                                     <a>72</a>
                                     <b>160</b>
-                                    <v>1796</v>
+                                    <v>1795</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27810,37 +27630,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40481</v>
+                                    <v>40458</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5883</v>
+                                    <v>5880</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>6024</v>
+                                    <v>6021</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>15</b>
-                                    <v>5425</v>
+                                    <v>5422</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>32</b>
-                                    <v>5284</v>
+                                    <v>5281</v>
                                 </b>
                                 <b>
                                     <a>32</a>
                                     <b>71</b>
-                                    <v>5284</v>
+                                    <v>5281</v>
                                 </b>
                                 <b>
                                     <a>72</a>
                                     <b>160</b>
-                                    <v>1796</v>
+                                    <v>1795</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27856,7 +27676,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>69513</v>
+                                    <v>69472</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27877,7 +27697,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5954</v>
+                                    <v>5950</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27898,7 +27718,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6200</v>
+                                    <v>6197</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27919,7 +27739,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5989</v>
+                                    <v>5985</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27934,19 +27754,19 @@
         </relation>
         <relation>
             <name>comments</name>
-            <cardinality>8781270</cardinality>
+            <cardinality>8783134</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>8781270</v>
+                    <v>8783134</v>
                 </e>
                 <e>
                     <k>contents</k>
-                    <v>3342962</v>
+                    <v>3343672</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>8781270</v>
+                    <v>8783134</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27960,7 +27780,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8781270</v>
+                                    <v>8783134</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27976,7 +27796,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8781270</v>
+                                    <v>8783134</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27992,17 +27812,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3058223</v>
+                                    <v>3058872</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>251135</v>
+                                    <v>251189</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>32784</b>
-                                    <v>33603</v>
+                                    <v>33610</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28018,17 +27838,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3058223</v>
+                                    <v>3058872</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>251135</v>
+                                    <v>251189</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>32784</b>
-                                    <v>33603</v>
+                                    <v>33610</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28044,7 +27864,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8781270</v>
+                                    <v>8783134</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28060,7 +27880,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8781270</v>
+                                    <v>8783134</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28070,15 +27890,15 @@
         </relation>
         <relation>
             <name>commentbinding</name>
-            <cardinality>3145674</cardinality>
+            <cardinality>3145838</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2490384</v>
+                    <v>2490514</v>
                 </e>
                 <e>
                     <k>element</k>
-                    <v>3068526</v>
+                    <v>3068686</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28092,12 +27912,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2408061</v>
+                                    <v>2408187</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>97</b>
-                                    <v>82322</v>
+                                    <v>82327</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28113,12 +27933,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2991378</v>
+                                    <v>2991533</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>77148</v>
+                                    <v>77152</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28128,15 +27948,15 @@
         </relation>
         <relation>
             <name>exprconv</name>
-            <cardinality>7003750</cardinality>
+            <cardinality>7003755</cardinality>
             <columnsizes>
                 <e>
                     <k>converted</k>
-                    <v>7003750</v>
+                    <v>7003755</v>
                 </e>
                 <e>
                     <k>conversion</k>
-                    <v>7003750</v>
+                    <v>7003755</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28150,7 +27970,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7003750</v>
+                                    <v>7003755</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28166,7 +27986,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7003750</v>
+                                    <v>7003755</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28176,22 +27996,22 @@
         </relation>
         <relation>
             <name>compgenerated</name>
-            <cardinality>8494343</cardinality>
+            <cardinality>8493976</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>8494343</v>
+                    <v>8493976</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>synthetic_destructor_call</name>
-            <cardinality>133110</cardinality>
+            <cardinality>133104</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
-                    <v>103484</v>
+                    <v>103479</v>
                 </e>
                 <e>
                     <k>i</k>
@@ -28199,7 +28019,7 @@
                 </e>
                 <e>
                     <k>destructor_call</k>
-                    <v>117766</v>
+                    <v>117760</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28213,12 +28033,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>85546</v>
+                                    <v>85542</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>11832</v>
+                                    <v>11831</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -28239,12 +28059,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>85546</v>
+                                    <v>85542</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>11832</v>
+                                    <v>11831</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -28417,7 +28237,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>115749</v>
+                                    <v>115743</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28438,7 +28258,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>117766</v>
+                                    <v>117760</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28486,7 +28306,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8937</v>
+                                    <v>8938</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28517,15 +28337,15 @@
         </relation>
         <relation>
             <name>namespacembrs</name>
-            <cardinality>2463100</cardinality>
+            <cardinality>2463228</cardinality>
             <columnsizes>
                 <e>
                     <k>parentid</k>
-                    <v>10819</v>
+                    <v>10820</v>
                 </e>
                 <e>
                     <k>memberid</k>
-                    <v>2463100</v>
+                    <v>2463228</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28605,7 +28425,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2463100</v>
+                                    <v>2463228</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28615,11 +28435,11 @@
         </relation>
         <relation>
             <name>exprparents</name>
-            <cardinality>14152882</cardinality>
+            <cardinality>14152891</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>14152882</v>
+                    <v>14152891</v>
                 </e>
                 <e>
                     <k>child_index</k>
@@ -28627,7 +28447,7 @@
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>9417999</v>
+                    <v>9418005</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28641,7 +28461,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14152882</v>
+                                    <v>14152891</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28657,7 +28477,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14152882</v>
+                                    <v>14152891</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28775,12 +28595,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5388939</v>
+                                    <v>5388942</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3692597</v>
+                                    <v>3692599</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -28801,12 +28621,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5388939</v>
+                                    <v>5388942</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3692597</v>
+                                    <v>3692599</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -28821,22 +28641,22 @@
         </relation>
         <relation>
             <name>expr_isload</name>
-            <cardinality>4981779</cardinality>
+            <cardinality>4981688</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>4981779</v>
+                    <v>4981688</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>conversionkinds</name>
-            <cardinality>4220621</cardinality>
+            <cardinality>4220624</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>4220621</v>
+                    <v>4220624</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -28854,7 +28674,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4220621</v>
+                                    <v>4220624</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28883,8 +28703,8 @@
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>26289</a>
-                                    <b>26290</b>
+                                    <a>26287</a>
+                                    <b>26288</b>
                                     <v>1</v>
                                 </b>
                                 <b>
@@ -28893,8 +28713,8 @@
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>4131029</a>
-                                    <b>4131030</b>
+                                    <a>4131034</a>
+                                    <b>4131035</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -28905,11 +28725,11 @@
         </relation>
         <relation>
             <name>iscall</name>
-            <cardinality>3078157</cardinality>
+            <cardinality>3078281</cardinality>
             <columnsizes>
                 <e>
                     <k>caller</k>
-                    <v>3078157</v>
+                    <v>3078281</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -28927,7 +28747,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3078157</v>
+                                    <v>3078281</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28951,8 +28771,8 @@
                                     <v>18</v>
                                 </b>
                                 <b>
-                                    <a>167025</a>
-                                    <b>167026</b>
+                                    <a>167040</a>
+                                    <b>167041</b>
                                     <v>18</v>
                                 </b>
                             </bs>
@@ -28963,11 +28783,11 @@
         </relation>
         <relation>
             <name>numtemplatearguments</name>
-            <cardinality>543303</cardinality>
+            <cardinality>543548</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>543303</v>
+                    <v>543548</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -28985,7 +28805,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>543303</v>
+                                    <v>543548</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29014,8 +28834,8 @@
                                     <v>18</v>
                                 </b>
                                 <b>
-                                    <a>29893</a>
-                                    <b>29894</b>
+                                    <a>29908</a>
+                                    <b>29909</b>
                                     <v>18</v>
                                 </b>
                             </bs>
@@ -29074,23 +28894,23 @@
         </relation>
         <relation>
             <name>namequalifiers</name>
-            <cardinality>1618961</cardinality>
+            <cardinality>1618866</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1618961</v>
+                    <v>1618866</v>
                 </e>
                 <e>
                     <k>qualifiableelement</k>
-                    <v>1618961</v>
+                    <v>1618866</v>
                 </e>
                 <e>
                     <k>qualifyingelement</k>
-                    <v>79675</v>
+                    <v>79653</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>282719</v>
+                    <v>282705</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29104,7 +28924,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1618961</v>
+                                    <v>1618866</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29120,7 +28940,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1618961</v>
+                                    <v>1618866</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29136,7 +28956,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1618961</v>
+                                    <v>1618866</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29152,7 +28972,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1618961</v>
+                                    <v>1618866</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29168,7 +28988,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1618961</v>
+                                    <v>1618866</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29184,7 +29004,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1618961</v>
+                                    <v>1618866</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29200,12 +29020,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>45546</v>
+                                    <v>45526</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>17163</v>
+                                    <v>17162</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -29236,12 +29056,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>45546</v>
+                                    <v>45526</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>17163</v>
+                                    <v>17162</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -29272,7 +29092,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>49725</v>
+                                    <v>49704</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29308,32 +29128,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>91742</v>
+                                    <v>91737</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>25646</v>
+                                    <v>25644</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>42179</v>
+                                    <v>42177</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>12895</v>
+                                    <v>12894</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>89869</v>
+                                    <v>89865</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>2135</b>
-                                    <v>20387</v>
+                                    <v>20386</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29349,32 +29169,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>91742</v>
+                                    <v>91737</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>25646</v>
+                                    <v>25644</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>42179</v>
+                                    <v>42177</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>12895</v>
+                                    <v>12894</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>89869</v>
+                                    <v>89865</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>2135</b>
-                                    <v>20387</v>
+                                    <v>20386</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29390,17 +29210,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>125168</v>
+                                    <v>125162</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>52354</v>
+                                    <v>52352</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>96622</v>
+                                    <v>96618</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -29415,11 +29235,11 @@
         </relation>
         <relation>
             <name>varbind</name>
-            <cardinality>6006364</cardinality>
+            <cardinality>6006368</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>6006364</v>
+                    <v>6006368</v>
                 </e>
                 <e>
                     <k>var</k>
@@ -29437,7 +29257,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6006364</v>
+                                    <v>6006368</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29508,15 +29328,15 @@
         </relation>
         <relation>
             <name>funbind</name>
-            <cardinality>3080553</cardinality>
+            <cardinality>3080676</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>3076933</v>
+                    <v>3077056</v>
                 </e>
                 <e>
                     <k>fun</k>
-                    <v>514055</v>
+                    <v>514013</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29530,7 +29350,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3073313</v>
+                                    <v>3073437</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29551,32 +29371,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>306582</v>
+                                    <v>306531</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>78775</v>
+                                    <v>78789</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>37226</v>
+                                    <v>37224</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>43475</v>
+                                    <v>43473</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>38</b>
-                                    <v>38703</v>
+                                    <v>38701</v>
                                 </b>
                                 <b>
                                     <a>38</a>
                                     <b>4943</b>
-                                    <v>9293</v>
+                                    <v>9292</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29586,11 +29406,11 @@
         </relation>
         <relation>
             <name>expr_allocator</name>
-            <cardinality>46541</cardinality>
+            <cardinality>46514</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>46541</v>
+                    <v>46514</v>
                 </e>
                 <e>
                     <k>func</k>
@@ -29612,7 +29432,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46541</v>
+                                    <v>46514</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29628,7 +29448,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46541</v>
+                                    <v>46514</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29712,11 +29532,11 @@
         </relation>
         <relation>
             <name>expr_deallocator</name>
-            <cardinality>55314</cardinality>
+            <cardinality>55282</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>55314</v>
+                    <v>55282</v>
                 </e>
                 <e>
                     <k>func</k>
@@ -29738,7 +29558,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>55314</v>
+                                    <v>55282</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29754,7 +29574,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>55314</v>
+                                    <v>55282</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29907,15 +29727,15 @@
         </relation>
         <relation>
             <name>expr_cond_true</name>
-            <cardinality>654499</cardinality>
+            <cardinality>654500</cardinality>
             <columnsizes>
                 <e>
                     <k>cond</k>
-                    <v>654499</v>
+                    <v>654500</v>
                 </e>
                 <e>
                     <k>true</k>
-                    <v>654499</v>
+                    <v>654500</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29929,7 +29749,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>654499</v>
+                                    <v>654500</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29945,7 +29765,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>654499</v>
+                                    <v>654500</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30003,11 +29823,11 @@
         </relation>
         <relation>
             <name>values</name>
-            <cardinality>10646146</cardinality>
+            <cardinality>10646153</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>10646146</v>
+                    <v>10646153</v>
                 </e>
                 <e>
                     <k>str</k>
@@ -30025,7 +29845,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10646146</v>
+                                    <v>10646153</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30071,15 +29891,15 @@
         </relation>
         <relation>
             <name>valuetext</name>
-            <cardinality>4756729</cardinality>
+            <cardinality>4756702</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4756729</v>
+                    <v>4756702</v>
                 </e>
                 <e>
                     <k>text</k>
-                    <v>703924</v>
+                    <v>703921</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30093,7 +29913,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4756729</v>
+                                    <v>4756702</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30114,17 +29934,17 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>102489</v>
+                                    <v>102490</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>56759</v>
+                                    <v>56757</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>425881</b>
-                                    <v>17147</v>
+                                    <v>17145</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30134,15 +29954,15 @@
         </relation>
         <relation>
             <name>valuebind</name>
-            <cardinality>11083050</cardinality>
+            <cardinality>11083057</cardinality>
             <columnsizes>
                 <e>
                     <k>val</k>
-                    <v>10646146</v>
+                    <v>10646153</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>11083050</v>
+                    <v>11083057</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30156,7 +29976,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10232022</v>
+                                    <v>10232029</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30177,7 +29997,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11083050</v>
+                                    <v>11083057</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30388,11 +30208,11 @@
         </relation>
         <relation>
             <name>bitfield</name>
-            <cardinality>20936</cardinality>
+            <cardinality>20941</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>20936</v>
+                    <v>20941</v>
                 </e>
                 <e>
                     <k>bits</k>
@@ -30414,7 +30234,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20936</v>
+                                    <v>20941</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30430,7 +30250,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20936</v>
+                                    <v>20941</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30574,23 +30394,23 @@
         </relation>
         <relation>
             <name>initialisers</name>
-            <cardinality>1731824</cardinality>
+            <cardinality>1732353</cardinality>
             <columnsizes>
                 <e>
                     <k>init</k>
-                    <v>1731824</v>
+                    <v>1732353</v>
                 </e>
                 <e>
                     <k>var</k>
-                    <v>717748</v>
+                    <v>721222</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>1731824</v>
+                    <v>1732353</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>390436</v>
+                    <v>390438</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30604,7 +30424,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1731824</v>
+                                    <v>1732353</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30620,7 +30440,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1731824</v>
+                                    <v>1732353</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30636,7 +30456,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1731824</v>
+                                    <v>1732353</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30652,22 +30472,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>629392</v>
+                                    <v>632463</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>16</b>
-                                    <v>31625</v>
+                                    <v>32109</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>25</b>
-                                    <v>56686</v>
-                                </b>
-                                <b>
-                                    <a>25</a>
-                                    <b>112</b>
-                                    <v>44</v>
+                                    <v>56649</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30683,22 +30498,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>629392</v>
+                                    <v>632463</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>16</b>
-                                    <v>31625</v>
+                                    <v>32109</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>25</b>
-                                    <v>56686</v>
-                                </b>
-                                <b>
-                                    <a>25</a>
-                                    <b>112</b>
-                                    <v>44</v>
+                                    <v>56649</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30714,12 +30524,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>717666</v>
+                                    <v>721215</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>4</b>
-                                    <v>81</v>
+                                    <b>3</b>
+                                    <v>6</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30735,7 +30545,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1731824</v>
+                                    <v>1732353</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30751,7 +30561,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1731824</v>
+                                    <v>1732353</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30767,7 +30577,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1731824</v>
+                                    <v>1732353</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30783,7 +30593,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>317956</v>
+                                    <v>317957</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30798,7 +30608,7 @@
                                 <b>
                                     <a>15</a>
                                     <b>111459</b>
-                                    <v>17855</v>
+                                    <v>17856</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30814,17 +30624,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>340955</v>
+                                    <v>340698</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>35579</v>
+                                    <v>35642</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12738</b>
-                                    <v>13901</v>
+                                    <v>14096</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30840,7 +30650,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>317956</v>
+                                    <v>317957</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30855,7 +30665,7 @@
                                 <b>
                                     <a>15</a>
                                     <b>111459</b>
-                                    <v>17855</v>
+                                    <v>17856</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30876,15 +30686,15 @@
         </relation>
         <relation>
             <name>expr_ancestor</name>
-            <cardinality>121674</cardinality>
+            <cardinality>121668</cardinality>
             <columnsizes>
                 <e>
                     <k>exp</k>
-                    <v>121674</v>
+                    <v>121668</v>
                 </e>
                 <e>
                     <k>ancestor</k>
-                    <v>84880</v>
+                    <v>84876</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30898,7 +30708,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>121674</v>
+                                    <v>121668</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30914,12 +30724,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>61377</v>
+                                    <v>61374</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>16785</v>
+                                    <v>16784</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -30939,19 +30749,19 @@
         </relation>
         <relation>
             <name>exprs</name>
-            <cardinality>18300140</cardinality>
+            <cardinality>18300152</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>18300140</v>
+                    <v>18300152</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>3382</v>
+                    <v>3380</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>3561673</v>
+                    <v>3559831</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30965,7 +30775,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18300140</v>
+                                    <v>18300152</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30981,7 +30791,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18300140</v>
+                                    <v>18300152</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31050,13 +30860,13 @@
                                     <v>281</v>
                                 </b>
                                 <b>
-                                    <a>6591</a>
-                                    <b>63491</b>
+                                    <a>6528</a>
+                                    <b>63599</b>
                                     <v>281</v>
                                 </b>
                                 <b>
-                                    <a>78915</a>
-                                    <b>109590</b>
+                                    <a>79044</a>
+                                    <b>109592</b>
                                     <v>70</v>
                                 </b>
                             </bs>
@@ -31127,11 +30937,11 @@
                                 </b>
                                 <b>
                                     <a>1051</a>
-                                    <b>14609</b>
+                                    <b>14618</b>
                                     <v>281</v>
                                 </b>
                                 <b>
-                                    <a>16974</a>
+                                    <a>16981</a>
                                     <b>32757</b>
                                     <v>140</v>
                                 </b>
@@ -31149,32 +30959,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1936933</v>
+                                    <v>1935551</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>816932</v>
+                                    <v>816946</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>247260</v>
+                                    <v>247397</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>280872</v>
+                                    <v>280461</v>
                                 </b>
                                 <b>
                                     <a>8</a>
-                                    <b>136</b>
-                                    <v>267131</v>
+                                    <b>137</b>
+                                    <v>267010</v>
                                 </b>
                                 <b>
-                                    <a>136</a>
+                                    <a>137</a>
                                     <b>54140</b>
-                                    <v>12542</v>
+                                    <v>12464</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31190,22 +31000,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2363808</v>
+                                    <v>2362352</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>873691</v>
+                                    <v>873426</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>307261</v>
+                                    <v>307151</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>25</b>
-                                    <v>16911</v>
+                                    <v>16901</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31215,15 +31025,15 @@
         </relation>
         <relation>
             <name>expr_types</name>
-            <cardinality>18357789</cardinality>
+            <cardinality>18357798</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>18300140</v>
+                    <v>18300152</v>
                 </e>
                 <e>
                     <k>typeid</k>
-                    <v>829282</v>
+                    <v>829243</v>
                 </e>
                 <e>
                     <k>value_category</k>
@@ -31241,12 +31051,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18242562</v>
+                                    <v>18242577</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>57577</v>
+                                    <v>57574</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31262,7 +31072,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18300140</v>
+                                    <v>18300152</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31278,42 +31088,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>293470</v>
+                                    <v>292376</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>160720</v>
+                                    <v>161054</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>69824</v>
+                                    <v>70343</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>60801</v>
+                                    <v>60978</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>66996</v>
+                                    <v>66993</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>12</b>
-                                    <v>65321</v>
+                                    <v>65336</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>35</b>
-                                    <v>62638</v>
+                                    <v>62653</v>
                                 </b>
                                 <b>
                                     <a>35</a>
-                                    <b>78674</b>
-                                    <v>49509</v>
+                                    <b>78689</b>
+                                    <v>49506</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31329,12 +31139,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>716180</v>
+                                    <v>715462</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>102314</v>
+                                    <v>102993</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -31353,18 +31163,18 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>11828</a>
-                                    <b>11829</b>
+                                    <a>11826</a>
+                                    <b>11827</b>
                                     <v>18</v>
                                 </b>
                                 <b>
-                                    <a>253738</a>
-                                    <b>253739</b>
+                                    <a>253755</a>
+                                    <b>253756</b>
                                     <v>18</v>
                                 </b>
                                 <b>
-                                    <a>750551</a>
-                                    <b>750552</b>
+                                    <a>750585</a>
+                                    <b>750586</b>
                                     <v>18</v>
                                 </b>
                             </bs>
@@ -31379,18 +31189,18 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1446</a>
-                                    <b>1447</b>
+                                    <a>1484</a>
+                                    <b>1485</b>
                                     <v>18</v>
                                 </b>
                                 <b>
-                                    <a>11978</a>
-                                    <b>11979</b>
+                                    <a>11980</a>
+                                    <b>11981</b>
                                     <v>18</v>
                                 </b>
                                 <b>
-                                    <a>39501</a>
-                                    <b>39502</b>
+                                    <a>39499</a>
+                                    <b>39500</b>
                                     <v>18</v>
                                 </b>
                             </bs>
@@ -31401,15 +31211,15 @@
         </relation>
         <relation>
             <name>new_allocated_type</name>
-            <cardinality>47598</cardinality>
+            <cardinality>47571</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>47598</v>
+                    <v>47571</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>28150</v>
+                    <v>28134</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -31423,7 +31233,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>47598</v>
+                                    <v>47571</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31439,17 +31249,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11767</v>
+                                    <v>11760</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>14903</v>
+                                    <v>14894</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>19</b>
-                                    <v>1479</v>
+                                    <v>1478</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32069,15 +31879,15 @@
         </relation>
         <relation>
             <name>condition_decl_bind</name>
-            <cardinality>38595</cardinality>
+            <cardinality>38593</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>38595</v>
+                    <v>38593</v>
                 </e>
                 <e>
                     <k>decl</k>
-                    <v>38595</v>
+                    <v>38593</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32091,7 +31901,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>38595</v>
+                                    <v>38593</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32107,7 +31917,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>38595</v>
+                                    <v>38593</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32117,15 +31927,15 @@
         </relation>
         <relation>
             <name>typeid_bind</name>
-            <cardinality>36430</cardinality>
+            <cardinality>36408</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>36430</v>
+                    <v>36408</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>16383</v>
+                    <v>16373</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32139,7 +31949,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36430</v>
+                                    <v>36408</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32155,7 +31965,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15960</v>
+                                    <v>15950</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -32354,11 +32164,11 @@
         </relation>
         <relation>
             <name>lambdas</name>
-            <cardinality>21639</cardinality>
+            <cardinality>21640</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>21639</v>
+                    <v>21640</v>
                 </e>
                 <e>
                     <k>default_capture</k>
@@ -32380,7 +32190,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21639</v>
+                                    <v>21640</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32396,7 +32206,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21639</v>
+                                    <v>21640</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32470,15 +32280,15 @@
         </relation>
         <relation>
             <name>lambda_capture</name>
-            <cardinality>28224</cardinality>
+            <cardinality>28226</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>28224</v>
+                    <v>28226</v>
                 </e>
                 <e>
                     <k>lambda</k>
-                    <v>20698</v>
+                    <v>20699</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -32486,7 +32296,7 @@
                 </e>
                 <e>
                     <k>field</k>
-                    <v>28224</v>
+                    <v>28226</v>
                 </e>
                 <e>
                     <k>captured_by_reference</k>
@@ -32512,7 +32322,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28224</v>
+                                    <v>28226</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32528,7 +32338,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28224</v>
+                                    <v>28226</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32544,7 +32354,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28224</v>
+                                    <v>28226</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32560,7 +32370,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28224</v>
+                                    <v>28226</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32576,7 +32386,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28224</v>
+                                    <v>28226</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32592,7 +32402,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28224</v>
+                                    <v>28226</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32608,12 +32418,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13171</v>
+                                    <v>13172</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7526</v>
+                                    <v>7527</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32629,12 +32439,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13171</v>
+                                    <v>13172</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7526</v>
+                                    <v>7527</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32650,12 +32460,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13171</v>
+                                    <v>13172</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7526</v>
+                                    <v>7527</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32671,7 +32481,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20698</v>
+                                    <v>20699</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32687,7 +32497,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20698</v>
+                                    <v>20699</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32703,12 +32513,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13171</v>
+                                    <v>13172</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7526</v>
+                                    <v>7527</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32840,7 +32650,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28224</v>
+                                    <v>28226</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32856,7 +32666,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28224</v>
+                                    <v>28226</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32872,7 +32682,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28224</v>
+                                    <v>28226</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32888,7 +32698,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28224</v>
+                                    <v>28226</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32904,7 +32714,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28224</v>
+                                    <v>28226</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32920,7 +32730,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28224</v>
+                                    <v>28226</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33349,19 +33159,19 @@
         </relation>
         <relation>
             <name>stmts</name>
-            <cardinality>4660299</cardinality>
+            <cardinality>4661289</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4660299</v>
+                    <v>4661289</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>1988</v>
+                    <v>1989</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2286915</v>
+                    <v>2287401</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33375,7 +33185,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4660299</v>
+                                    <v>4661289</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33391,7 +33201,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4660299</v>
+                                    <v>4661289</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33619,22 +33429,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1892154</v>
+                                    <v>1892555</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>175972</v>
+                                    <v>176010</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>176182</v>
+                                    <v>176219</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>699</b>
-                                    <v>42606</v>
+                                    <v>42615</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33650,12 +33460,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2229653</v>
+                                    <v>2230127</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>57261</v>
+                                    <v>57274</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33953,15 +33763,15 @@
         </relation>
         <relation>
             <name>constexpr_if_then</name>
-            <cardinality>52551</cardinality>
+            <cardinality>52562</cardinality>
             <columnsizes>
                 <e>
                     <k>constexpr_if_stmt</k>
-                    <v>52551</v>
+                    <v>52562</v>
                 </e>
                 <e>
                     <k>then_id</k>
-                    <v>52551</v>
+                    <v>52562</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33975,7 +33785,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52551</v>
+                                    <v>52562</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33991,7 +33801,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52551</v>
+                                    <v>52562</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34001,15 +33811,15 @@
         </relation>
         <relation>
             <name>constexpr_if_else</name>
-            <cardinality>30881</cardinality>
+            <cardinality>30888</cardinality>
             <columnsizes>
                 <e>
                     <k>constexpr_if_stmt</k>
-                    <v>30881</v>
+                    <v>30888</v>
                 </e>
                 <e>
                     <k>else_id</k>
-                    <v>30881</v>
+                    <v>30888</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34023,7 +33833,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30881</v>
+                                    <v>30888</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34039,7 +33849,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30881</v>
+                                    <v>30888</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34049,15 +33859,15 @@
         </relation>
         <relation>
             <name>while_body</name>
-            <cardinality>30207</cardinality>
+            <cardinality>30201</cardinality>
             <columnsizes>
                 <e>
                     <k>while_stmt</k>
-                    <v>30207</v>
+                    <v>30201</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>30207</v>
+                    <v>30201</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34071,7 +33881,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30207</v>
+                                    <v>30201</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34087,7 +33897,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30207</v>
+                                    <v>30201</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34097,15 +33907,15 @@
         </relation>
         <relation>
             <name>do_body</name>
-            <cardinality>148604</cardinality>
+            <cardinality>148599</cardinality>
             <columnsizes>
                 <e>
                     <k>do_stmt</k>
-                    <v>148604</v>
+                    <v>148599</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>148604</v>
+                    <v>148599</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34119,7 +33929,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>148604</v>
+                                    <v>148599</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34135,7 +33945,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>148604</v>
+                                    <v>148599</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34193,7 +34003,7 @@
         </relation>
         <relation>
             <name>switch_case</name>
-            <cardinality>191408</cardinality>
+            <cardinality>191399</cardinality>
             <columnsizes>
                 <e>
                     <k>switch_stmt</k>
@@ -34205,7 +34015,7 @@
                 </e>
                 <e>
                     <k>case_id</k>
-                    <v>191408</v>
+                    <v>191399</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34361,7 +34171,7 @@
                                 <b>
                                     <a>32</a>
                                     <b>33</b>
-                                    <v>1909</v>
+                                    <v>1908</v>
                                 </b>
                                 <b>
                                     <a>33</a>
@@ -34402,7 +34212,7 @@
                                 <b>
                                     <a>32</a>
                                     <b>33</b>
-                                    <v>1909</v>
+                                    <v>1908</v>
                                 </b>
                                 <b>
                                     <a>33</a>
@@ -34433,7 +34243,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>191408</v>
+                                    <v>191399</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34449,7 +34259,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>191408</v>
+                                    <v>191399</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34699,19 +34509,19 @@
         </relation>
         <relation>
             <name>stmtparents</name>
-            <cardinality>4052305</cardinality>
+            <cardinality>4052323</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4052305</v>
+                    <v>4052323</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>12209</v>
+                    <v>12210</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>1719463</v>
+                    <v>1719470</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34725,7 +34535,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4052305</v>
+                                    <v>4052323</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34741,7 +34551,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4052305</v>
+                                    <v>4052323</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34879,12 +34689,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>987317</v>
+                                    <v>987321</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>372963</v>
+                                    <v>372965</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -34894,7 +34704,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>111241</v>
+                                    <v>111242</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -34920,12 +34730,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>987317</v>
+                                    <v>987321</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>372963</v>
+                                    <v>372965</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -34935,7 +34745,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>111241</v>
+                                    <v>111242</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -34955,11 +34765,11 @@
         </relation>
         <relation>
             <name>ishandler</name>
-            <cardinality>59432</cardinality>
+            <cardinality>59429</cardinality>
             <columnsizes>
                 <e>
                     <k>block</k>
-                    <v>59432</v>
+                    <v>59429</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -35528,15 +35338,15 @@
         </relation>
         <relation>
             <name>blockscope</name>
-            <cardinality>1438063</cardinality>
+            <cardinality>1438137</cardinality>
             <columnsizes>
                 <e>
                     <k>block</k>
-                    <v>1438063</v>
+                    <v>1438137</v>
                 </e>
                 <e>
                     <k>enclosing</k>
-                    <v>1321870</v>
+                    <v>1321939</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35550,7 +35360,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1438063</v>
+                                    <v>1438137</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35566,12 +35376,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1256011</v>
+                                    <v>1256077</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>13</b>
-                                    <v>65858</v>
+                                    <v>65861</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35581,19 +35391,19 @@
         </relation>
         <relation>
             <name>jumpinfo</name>
-            <cardinality>253995</cardinality>
+            <cardinality>253987</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>253995</v>
+                    <v>253987</v>
                 </e>
                 <e>
                     <k>str</k>
-                    <v>21152</v>
+                    <v>21151</v>
                 </e>
                 <e>
                     <k>target</k>
-                    <v>53046</v>
+                    <v>53044</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35607,7 +35417,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>253995</v>
+                                    <v>253987</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35623,7 +35433,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>253995</v>
+                                    <v>253987</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35685,7 +35495,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16717</v>
+                                    <v>16716</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -35721,7 +35531,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>26428</v>
+                                    <v>26427</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -35736,7 +35546,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>4691</v>
+                                    <v>4690</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -35757,7 +35567,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53046</v>
+                                    <v>53044</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35767,19 +35577,19 @@
         </relation>
         <relation>
             <name>preprocdirects</name>
-            <cardinality>4431252</cardinality>
+            <cardinality>4432193</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4431252</v>
+                    <v>4432193</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>1046</v>
+                    <v>1047</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>4428739</v>
+                    <v>4429680</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35793,7 +35603,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4431252</v>
+                                    <v>4432193</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35809,7 +35619,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4431252</v>
+                                    <v>4432193</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35947,7 +35757,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4428635</v>
+                                    <v>4429575</v>
                                 </b>
                                 <b>
                                     <a>25</a>
@@ -35968,7 +35778,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4428739</v>
+                                    <v>4429680</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35978,15 +35788,15 @@
         </relation>
         <relation>
             <name>preprocpair</name>
-            <cardinality>1442296</cardinality>
+            <cardinality>1442371</cardinality>
             <columnsizes>
                 <e>
                     <k>begin</k>
-                    <v>1206147</v>
+                    <v>1206210</v>
                 </e>
                 <e>
                     <k>elseelifend</k>
-                    <v>1442296</v>
+                    <v>1442371</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36000,12 +35810,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>985992</v>
+                                    <v>986044</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>209805</v>
+                                    <v>209816</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -36026,7 +35836,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1442296</v>
+                                    <v>1442371</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36036,41 +35846,41 @@
         </relation>
         <relation>
             <name>preproctrue</name>
-            <cardinality>782302</cardinality>
+            <cardinality>783284</cardinality>
             <columnsizes>
                 <e>
                     <k>branch</k>
-                    <v>782302</v>
+                    <v>783284</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>preprocfalse</name>
-            <cardinality>327409</cardinality>
+            <cardinality>326956</cardinality>
             <columnsizes>
                 <e>
                     <k>branch</k>
-                    <v>327409</v>
+                    <v>326956</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>preproctext</name>
-            <cardinality>3572638</cardinality>
+            <cardinality>3573396</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3572638</v>
+                    <v>3573396</v>
                 </e>
                 <e>
                     <k>head</k>
-                    <v>2591544</v>
+                    <v>2592094</v>
                 </e>
                 <e>
                     <k>body</k>
-                    <v>1515816</v>
+                    <v>1516138</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36084,7 +35894,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3572638</v>
+                                    <v>3573396</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36100,7 +35910,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3572638</v>
+                                    <v>3573396</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36116,12 +35926,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2444464</v>
+                                    <v>2444983</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>740</b>
-                                    <v>147080</v>
+                                    <v>147111</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36137,12 +35947,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2529362</v>
+                                    <v>2529899</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>62181</v>
+                                    <v>62195</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36158,17 +35968,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1372191</v>
+                                    <v>1372482</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>113686</v>
+                                    <v>113710</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>11572</b>
-                                    <v>29939</v>
+                                    <v>29945</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36184,17 +35994,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1375227</v>
+                                    <v>1375519</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>114000</v>
+                                    <v>114024</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>2959</b>
-                                    <v>26589</v>
+                                    <v>26595</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36204,15 +36014,15 @@
         </relation>
         <relation>
             <name>includes</name>
-            <cardinality>315649</cardinality>
+            <cardinality>315665</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>315649</v>
+                    <v>315665</v>
                 </e>
                 <e>
                     <k>included</k>
-                    <v>118074</v>
+                    <v>118080</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36226,7 +36036,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>315649</v>
+                                    <v>315665</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36242,12 +36052,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>61624</v>
+                                    <v>61627</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>22109</v>
+                                    <v>22110</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -36262,7 +36072,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>14</b>
-                                    <v>8937</v>
+                                    <v>8938</v>
                                 </b>
                                 <b>
                                     <a>14</a>
@@ -36325,11 +36135,11 @@
         </relation>
         <relation>
             <name>link_parent</name>
-            <cardinality>40143068</cardinality>
+            <cardinality>40119536</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
-                    <v>5115983</v>
+                    <v>5112984</v>
                 </e>
                 <e>
                     <k>link_target</k>
@@ -36347,17 +36157,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>701934</v>
+                                    <v>701522</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>9</b>
-                                    <v>44146</v>
+                                    <v>44120</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>4369903</v>
+                                    <v>4367341</v>
                                 </b>
                             </bs>
                         </hist>
diff --git a/cpp/ql/lib/upgrades/19e31bf071f588bb7efd1e4d5a185ce4f6fbbd84/old.dbscheme b/cpp/ql/lib/upgrades/19e31bf071f588bb7efd1e4d5a185ce4f6fbbd84/old.dbscheme
new file mode 100644
index 00000000000..19e31bf071f
--- /dev/null
+++ b/cpp/ql/lib/upgrades/19e31bf071f588bb7efd1e4d5a185ce4f6fbbd84/old.dbscheme
@@ -0,0 +1,2115 @@
+
+/**
+ * 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
+ */
+
+@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 @macroinvocations.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
+  | 2 = constructor
+  | 3 = destructor
+  | 4 = conversion
+  | 5 = operator
+  | 6 = builtin     // GCC built-in functions, e.g. __builtin___memcpy_chk
+  ;
+*/
+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);
+
+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
+);
+
+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 = error
+  | 2 = unknown
+  | 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 = __int8                 // Microsoft-specific
+  | 21 = __int16                // Microsoft-specific
+  | 22 = __int32                // Microsoft-specific
+  | 23 = __int64                // Microsoft-specific
+  | 24 = float
+  | 25 = double
+  | 26 = long_double
+  | 27 = _Complex_float         // C99-specific
+  | 28 = _Complex_double        // C99-specific
+  | 29 = _Complex_long double   // C99-specific
+  | 30 = _Imaginary_float       // C99-specific
+  | 31 = _Imaginary_double      // C99-specific
+  | 32 = _Imaginary_long_double // C99-specific
+  | 33 = wchar_t                // Microsoft-specific
+  | 34 = decltype_nullptr       // C++11
+  | 35 = __int128
+  | 36 = unsigned___int128
+  | 37 = signed___int128
+  | 38 = __float128
+  | 39 = _Complex___float128
+  | 40 = _Decimal32
+  | 41 = _Decimal64
+  | 42 = _Decimal128
+  | 43 = char16_t
+  | 44 = char32_t
+  | 45 = _Float32
+  | 46 = _Float32x
+  | 47 = _Float64
+  | 48 = _Float64x
+  | 49 = _Float128
+  | 50 = _Float128x
+  | 51 = char8_t
+  ;
+*/
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/*
+  Derived types are types that are directly derived from existing types and
+  point to, refer to, transform type data to return a new type.
+
+  case @derivedtype.kind of
+    1 = pointer
+  | 2 = reference
+  | 3 = type_with_specifiers
+  | 4 = array
+  | 5 = gnu_vector
+  | 6 = routineptr
+  | 7 = routinereference
+  | 8 = rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+  | 10 = block
+  ;
+*/
+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
+);
+
+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 EDG frontend.  See symbol_ref.h there.
+    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
+;
+
+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_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
+                     | @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr | @assign_bitwise_expr
+
+@assign_expr = @assignexpr | @assign_op_expr
+
+/*
+  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
+);
+
+/*
+  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 // EDG 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
+;
+
+@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
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            ;
+
+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.
+ */
+#keyset[aggregate, field]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array.
+ */
+#keyset[aggregate, element_index]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: 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
+);
+
+for_initialization(
+    unique int for_stmt: @stmt_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(
+    unique 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/19e31bf071f588bb7efd1e4d5a185ce4f6fbbd84/semmlecode.cpp.dbscheme b/cpp/ql/lib/upgrades/19e31bf071f588bb7efd1e4d5a185ce4f6fbbd84/semmlecode.cpp.dbscheme
new file mode 100644
index 00000000000..23f7cbb88a4
--- /dev/null
+++ b/cpp/ql/lib/upgrades/19e31bf071f588bb7efd1e4d5a185ce4f6fbbd84/semmlecode.cpp.dbscheme
@@ -0,0 +1,2125 @@
+
+/**
+ * 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
+ */
+
+@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 @macroinvocations.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
+  | 2 = constructor
+  | 3 = destructor
+  | 4 = conversion
+  | 5 = operator
+  | 6 = builtin     // GCC built-in functions, e.g. __builtin___memcpy_chk
+  ;
+*/
+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);
+
+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
+);
+
+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 = error
+  | 2 = unknown
+  | 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 = __int8                 // Microsoft-specific
+  | 21 = __int16                // Microsoft-specific
+  | 22 = __int32                // Microsoft-specific
+  | 23 = __int64                // Microsoft-specific
+  | 24 = float
+  | 25 = double
+  | 26 = long_double
+  | 27 = _Complex_float         // C99-specific
+  | 28 = _Complex_double        // C99-specific
+  | 29 = _Complex_long double   // C99-specific
+  | 30 = _Imaginary_float       // C99-specific
+  | 31 = _Imaginary_double      // C99-specific
+  | 32 = _Imaginary_long_double // C99-specific
+  | 33 = wchar_t                // Microsoft-specific
+  | 34 = decltype_nullptr       // C++11
+  | 35 = __int128
+  | 36 = unsigned___int128
+  | 37 = signed___int128
+  | 38 = __float128
+  | 39 = _Complex___float128
+  | 40 = _Decimal32
+  | 41 = _Decimal64
+  | 42 = _Decimal128
+  | 43 = char16_t
+  | 44 = char32_t
+  | 45 = _Float32
+  | 46 = _Float32x
+  | 47 = _Float64
+  | 48 = _Float64x
+  | 49 = _Float128
+  | 50 = _Float128x
+  | 51 = char8_t
+  ;
+*/
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/*
+  Derived types are types that are directly derived from existing types and
+  point to, refer to, transform type data to return a new type.
+
+  case @derivedtype.kind of
+    1 = pointer
+  | 2 = reference
+  | 3 = type_with_specifiers
+  | 4 = array
+  | 5 = gnu_vector
+  | 6 = routineptr
+  | 7 = routinereference
+  | 8 = rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+  | 10 = block
+  ;
+*/
+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
+);
+
+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 EDG frontend.  See symbol_ref.h there.
+    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
+;
+
+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_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
+                     | @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr | @assign_bitwise_expr
+
+@assign_expr = @assignexpr | @assign_op_expr
+
+/*
+  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
+);
+
+/*
+  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 // EDG 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
+;
+
+@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
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            ;
+
+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.
+ */
+#keyset[aggregate, field]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array.
+ */
+#keyset[aggregate, element_index]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: 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
+);
+
+for_initialization(
+    unique int for_stmt: @stmt_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(
+    unique 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/19e31bf071f588bb7efd1e4d5a185ce4f6fbbd84/upgrade.properties b/cpp/ql/lib/upgrades/19e31bf071f588bb7efd1e4d5a185ce4f6fbbd84/upgrade.properties
new file mode 100644
index 00000000000..db0e7e92d0e
--- /dev/null
+++ b/cpp/ql/lib/upgrades/19e31bf071f588bb7efd1e4d5a185ce4f6fbbd84/upgrade.properties
@@ -0,0 +1,2 @@
+description: Add new builtin operations
+compatibility: backwards
diff --git a/cpp/ql/test/library-tests/builtins/edg/edg.c b/cpp/ql/test/library-tests/builtins/edg/edg.c
index d1a78435317..f1f0f0f1375 100644
--- a/cpp/ql/test/library-tests/builtins/edg/edg.c
+++ b/cpp/ql/test/library-tests/builtins/edg/edg.c
@@ -1,4 +1,4 @@
-
+// semmle-extractor-options: --clang
 struct mystruct {
     int f1;
     int f2;
@@ -13,3 +13,6 @@ void f(void) {
     int i2 = edg_offsetof(struct mystruct,f2);
 }
 
+void g(void) {
+    double f = __builtin_bit_cast(double,42l);
+}
diff --git a/cpp/ql/test/library-tests/builtins/edg/expr.expected b/cpp/ql/test/library-tests/builtins/edg/expr.expected
index 0969dc1e217..5ab0747ecc7 100644
--- a/cpp/ql/test/library-tests/builtins/edg/expr.expected
+++ b/cpp/ql/test/library-tests/builtins/edg/expr.expected
@@ -13,3 +13,6 @@
 | edg.c:13:14:13:45 | (size_t)... | 0 | 0 |
 | edg.c:13:14:13:45 | __INTADDR__ | 1 | 1 |
 | edg.c:13:43:13:44 | f2 | 0 | 0 |
+| edg.c:17:16:17:45 | __builtin_bit_cast | 1 | 1 |
+| edg.c:17:16:17:45 | double | 0 | 0 |
+| edg.c:17:42:17:44 | 42 | 1 | 1 |
diff --git a/cpp/ql/test/library-tests/builtins/type_traits/expr.expected b/cpp/ql/test/library-tests/builtins/type_traits/expr.expected
index 47918496198..a19d917aaac 100644
--- a/cpp/ql/test/library-tests/builtins/type_traits/expr.expected
+++ b/cpp/ql/test/library-tests/builtins/type_traits/expr.expected
@@ -296,3 +296,20 @@
 | ms.cpp:255:24:255:43 | a_struct |  | <none> |
 | ms.cpp:256:24:256:49 | __is_final | a_final_struct | 1 |
 | ms.cpp:256:24:256:49 | a_final_struct |  | <none> |
+| ms.cpp:258:29:258:62 | __is_assignable | a_struct,a_struct | 1 |
+| ms.cpp:258:29:258:62 | a_struct |  | <none> |
+| ms.cpp:258:29:258:62 | a_struct |  | <none> |
+| ms.cpp:259:29:259:59 | __is_assignable | a_struct,empty | 0 |
+| ms.cpp:259:29:259:59 | a_struct |  | <none> |
+| ms.cpp:259:29:259:59 | empty |  | <none> |
+| ms.cpp:260:29:260:57 | __is_assignable | a_struct,int | 0 |
+| ms.cpp:260:29:260:57 | a_struct |  | <none> |
+| ms.cpp:260:29:260:57 | int |  | <none> |
+| ms.cpp:262:28:262:51 | __is_aggregate | a_struct | 1 |
+| ms.cpp:262:28:262:51 | a_struct |  | <none> |
+| ms.cpp:263:28:263:46 | __is_aggregate | int | 0 |
+| ms.cpp:263:28:263:46 | int |  | <none> |
+| ms.cpp:265:49:265:88 | __has_unique_object_representations | int | 1 |
+| ms.cpp:265:49:265:88 | int |  | <none> |
+| ms.cpp:266:49:266:90 | __has_unique_object_representations | float | 0 |
+| ms.cpp:266:49:266:90 | float |  | <none> |
diff --git a/cpp/ql/test/library-tests/builtins/type_traits/ms.cpp b/cpp/ql/test/library-tests/builtins/type_traits/ms.cpp
index 742f95faf07..91d6245cc35 100644
--- a/cpp/ql/test/library-tests/builtins/type_traits/ms.cpp
+++ b/cpp/ql/test/library-tests/builtins/type_traits/ms.cpp
@@ -254,5 +254,14 @@ void f(void) {
 
     bool b_is_final1 = __is_final(a_struct);
     bool b_is_final2 = __is_final(a_final_struct);
-}
 
+    bool b_is_assignable1 = __is_assignable(a_struct,a_struct);
+    bool b_is_assignable2 = __is_assignable(a_struct,empty);
+    bool b_is_assignable3 = __is_assignable(a_struct,int);
+
+    bool b_is_aggregate1 = __is_aggregate(a_struct);
+    bool b_is_aggregate2 = __is_aggregate(int);
+
+    bool b_has_unique_object_representations1 = __has_unique_object_representations(int);
+    bool b_has_unique_object_representations2 = __has_unique_object_representations(float);
+}
diff --git a/cpp/ql/test/library-tests/vector_types/builtin_ops.expected b/cpp/ql/test/library-tests/vector_types/builtin_ops.expected
index 2c0dd9d0017..756ca2f1c17 100644
--- a/cpp/ql/test/library-tests/vector_types/builtin_ops.expected
+++ b/cpp/ql/test/library-tests/vector_types/builtin_ops.expected
@@ -1,2 +1,4 @@
+| vector_types2.cpp:10:15:10:42 | __builtin_shuffle |
+| vector_types2.cpp:11:15:11:45 | __builtin_shuffle |
 | vector_types.cpp:31:13:31:49 | __builtin_shufflevector |
 | vector_types.cpp:58:10:58:52 | __builtin_convertvector |
diff --git a/cpp/ql/test/library-tests/vector_types/variables.expected b/cpp/ql/test/library-tests/vector_types/variables.expected
index 2494f192e9a..52fa98dd3f0 100644
--- a/cpp/ql/test/library-tests/vector_types/variables.expected
+++ b/cpp/ql/test/library-tests/vector_types/variables.expected
@@ -13,6 +13,12 @@
 | file://:0:0:0:0 | gp_offset | gp_offset | file://:0:0:0:0 | unsigned int | 4 |
 | file://:0:0:0:0 | overflow_arg_area | overflow_arg_area | file://:0:0:0:0 | void * | 8 |
 | file://:0:0:0:0 | reg_save_area | reg_save_area | file://:0:0:0:0 | void * | 8 |
+| vector_types2.cpp:5:7:5:7 | a | a | vector_types2.cpp:2:13:2:15 | v4i | 16 |
+| vector_types2.cpp:6:7:6:7 | b | b | vector_types2.cpp:2:13:2:15 | v4i | 16 |
+| vector_types2.cpp:7:7:7:12 | mask_1 | mask_1 | vector_types2.cpp:2:13:2:15 | v4i | 16 |
+| vector_types2.cpp:8:7:8:12 | mask_2 | mask_2 | vector_types2.cpp:2:13:2:15 | v4i | 16 |
+| vector_types2.cpp:10:7:10:11 | res_1 | res_1 | vector_types2.cpp:2:13:2:15 | v4i | 16 |
+| vector_types2.cpp:11:7:11:11 | res_2 | res_2 | vector_types2.cpp:2:13:2:15 | v4i | 16 |
 | vector_types.cpp:9:21:9:21 | x | x | vector_types.cpp:6:15:6:17 | v4f | 16 |
 | vector_types.cpp:14:18:14:20 | lhs | lhs | vector_types.cpp:6:15:6:17 | v4f | 16 |
 | vector_types.cpp:14:27:14:29 | rhs | rhs | vector_types.cpp:6:15:6:17 | v4f | 16 |
diff --git a/cpp/ql/test/library-tests/vector_types/vector_types2.cpp b/cpp/ql/test/library-tests/vector_types/vector_types2.cpp
new file mode 100644
index 00000000000..d4233b28890
--- /dev/null
+++ b/cpp/ql/test/library-tests/vector_types/vector_types2.cpp
@@ -0,0 +1,12 @@
+// semmle-extractor-options: --gnu --gnu_version 80000
+typedef int v4i __attribute__((vector_size (16)));
+
+void f() {
+  v4i a = {1,2,3,4};
+  v4i b = {5,6,7,8};
+  v4i mask_1 = {3,0,1,2};
+  v4i mask_2 = {3,5,4,2};
+
+  v4i res_1 = __builtin_shuffle(a, mask_1);
+  v4i res_2 = __builtin_shuffle(a, b, mask_2);
+}