From 097d5665e8f4870f82531b1c60cd754c6abe1a9c Mon Sep 17 00:00:00 2001
From: Jeroen Ketema <jketema@github.com>
Date: Wed, 14 Oct 2026 11:15:06 +0200
Subject: [PATCH 1/4] C++: Add support for C23 `_BitInt`s

---
 cpp/ql/lib/semmle/code/cpp/Type.qll | 47 +++++++++++++++--
 cpp/ql/lib/semmlecode.cpp.dbscheme  | 80 ++++++++++++++++-------------
 2 files changed, 87 insertions(+), 40 deletions(-)

diff --git a/cpp/ql/lib/semmle/code/cpp/Type.qll b/cpp/ql/lib/semmle/code/cpp/Type.qll
index 4069b58134be..023aa1b6c3d4 100644
--- a/cpp/ql/lib/semmle/code/cpp/Type.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Type.qll
@@ -398,6 +398,8 @@ private predicate isIntegralType(@builtintype type, int kind) {
     kind = 44
     or
     kind = 51
+    or
+    67 <= kind and kind <= 69
   )
 }
 
@@ -484,6 +486,12 @@ private predicate integralTypeMapping(int original, int canonical, int unsigned,
   original = 44 and canonical = 44 and unsigned = -1 and signed = -1 // char32_t
   or
   original = 51 and canonical = 51 and unsigned = -1 and signed = -1 // char8_t
+  or
+  original = 67 and canonical = 67 and unsigned = 68 and signed = 69 // _BitInt(N)
+  or
+  original = 68 and canonical = 68 and unsigned = 68 and signed = 69 // unsigned _BitInt(N)
+  or
+  original = 69 and canonical = 67 and unsigned = 68 and signed = 69 // signed _BitInt(N)
 }
 
 /**
@@ -517,7 +525,8 @@ class IntegralType extends ArithmeticType, IntegralOrEnumType {
     builtintypes(underlyingElement(this), _, 13, _, _, _) or
     builtintypes(underlyingElement(this), _, 16, _, _, _) or
     builtintypes(underlyingElement(this), _, 19, _, _, _) or
-    builtintypes(underlyingElement(this), _, 37, _, _, _)
+    builtintypes(underlyingElement(this), _, 37, _, _, _) or
+    builtintypes(underlyingElement(this), _, 69, _, _, _)
   }
 
   /** Holds if this integral type is explicitly unsigned. */
@@ -527,7 +536,8 @@ class IntegralType extends ArithmeticType, IntegralOrEnumType {
     builtintypes(underlyingElement(this), _, 12, _, _, _) or
     builtintypes(underlyingElement(this), _, 15, _, _, _) or
     builtintypes(underlyingElement(this), _, 18, _, _, _) or
-    builtintypes(underlyingElement(this), _, 36, _, _, _)
+    builtintypes(underlyingElement(this), _, 36, _, _, _) or
+    builtintypes(underlyingElement(this), _, 68, _, _, _)
   }
 
   /** Holds if this integral type is implicitly signed. */
@@ -537,7 +547,8 @@ class IntegralType extends ArithmeticType, IntegralOrEnumType {
     builtintypes(underlyingElement(this), _, 11, _, -1, _) or
     builtintypes(underlyingElement(this), _, 14, _, -1, _) or
     builtintypes(underlyingElement(this), _, 17, _, -1, _) or
-    builtintypes(underlyingElement(this), _, 35, _, -1, _)
+    builtintypes(underlyingElement(this), _, 35, _, -1, _) or
+    builtintypes(underlyingElement(this), _, 67, _, -1, _)
   }
 
   /**
@@ -547,7 +558,14 @@ class IntegralType extends ArithmeticType, IntegralOrEnumType {
   IntegralType getUnsigned() {
     exists(int unsignedKind |
       integralTypeMapping(kind, _, unsignedKind, _) and
-      builtintypes(unresolveElement(result), _, unsignedKind, _, _, _)
+      builtintypes(unresolveElement(result), _, unsignedKind, _, _, _) and
+      (
+        not kind in [67, 68, 69]
+        or
+        exists(int bitWidth | bit_precise_int_types(underlyingElement(this), bitWidth) |
+          bit_precise_int_types(unresolveElement(result), bitWidth)
+        )
+      )
     )
   }
 
@@ -562,7 +580,14 @@ class IntegralType extends ArithmeticType, IntegralOrEnumType {
   IntegralType getCanonicalArithmeticType() {
     exists(int canonicalKind |
       integralTypeMapping(kind, canonicalKind, _, _) and
-      builtintypes(unresolveElement(result), _, canonicalKind, _, _, _)
+      builtintypes(unresolveElement(result), _, canonicalKind, _, _, _) and
+      (
+        not kind in [67, 68, 69]
+        or
+        exists(int bitWidth | bit_precise_int_types(underlyingElement(this), bitWidth) |
+          bit_precise_int_types(unresolveElement(result), bitWidth)
+        )
+      )
     )
   }
 }
@@ -1045,6 +1070,18 @@ class Char32Type extends IntegralType {
   override string getAPrimaryQlClass() { result = "Char32Type" }
 }
 
+/**
+ * A C23 bit-precise integer type `_BitInt(N)`.
+ */
+class BitPreciseIntType extends IntegralType {
+  BitPreciseIntType() { builtintypes(underlyingElement(this), _, [67, 68, 69], _, _, _) }
+
+  /** Get the bit-with of the bit-precise integer. */
+  int getBitWidth() { bit_precise_int_types(underlyingElement(this), result) }
+
+  override string getAPrimaryQlClass() { result = "BitPreciseIntType" }
+}
+
 /**
  * The (primitive) type of the C++11 `nullptr` constant.  It is a
  * distinct type, denoted by `decltype(nullptr)`, that is not itself a pointer
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme b/cpp/ql/lib/semmlecode.cpp.dbscheme
index 0853f43dc8c0..6aec212e408f 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme
@@ -660,46 +660,49 @@ case @builtintype.kind of
 | 24 = @float
 | 25 = @double
 | 26 = @long_double
-| 27 = @complex_float         // C99-specific _Complex float
-| 28 = @complex_double        // C99-specific _Complex double
-| 29 = @complex_long_double   // C99-specific _Complex long double
-| 30 = @imaginary_float       // C99-specific _Imaginary float
-| 31 = @imaginary_double      // C99-specific _Imaginary double
-| 32 = @imaginary_long_double // C99-specific _Imaginary long double
-| 33 = @wchar_t               // Microsoft-specific
-| 34 = @decltype_nullptr      // C++11
-| 35 = @int128                // __int128
-| 36 = @unsigned_int128       // unsigned __int128
-| 37 = @signed_int128         // signed __int128
-| 38 = @float128              // __float128
-| 39 = @complex_float128      // _Complex __float128
+| 27 = @complex_float            // C99-specific _Complex float
+| 28 = @complex_double           // C99-specific _Complex double
+| 29 = @complex_long_double      // C99-specific _Complex long double
+| 30 = @imaginary_float          // C99-specific _Imaginary float
+| 31 = @imaginary_double         // C99-specific _Imaginary double
+| 32 = @imaginary_long_double    // C99-specific _Imaginary long double
+| 33 = @wchar_t                  // Microsoft-specific
+| 34 = @decltype_nullptr         // C++11
+| 35 = @int128                   // __int128
+| 36 = @unsigned_int128          // unsigned __int128
+| 37 = @signed_int128            // signed __int128
+| 38 = @float128                 // __float128
+| 39 = @complex_float128         // _Complex __float128
 // ... 40 _Decimal32
 // ... 41 _Decimal64
 // ... 42 _Decimal128
 | 43 = @char16_t
 | 44 = @char32_t
-| 45 = @std_float32           // _Float32
-| 46 = @float32x              // _Float32x
-| 47 = @std_float64           // _Float64
-| 48 = @float64x              // _Float64x
-| 49 = @std_float128          // _Float128
+| 45 = @std_float32              // _Float32
+| 46 = @float32x                 // _Float32x
+| 47 = @std_float64              // _Float64
+| 48 = @float64x                 // _Float64x
+| 49 = @std_float128             // _Float128
 // ... 50 _Float128x
 | 51 = @char8_t
-| 52 = @float16               // _Float16
-| 53 = @complex_float16       // _Complex _Float16
-| 54 = @fp16                  // __fp16
-| 55 = @std_bfloat16          // __bf16
-| 56 = @std_float16           // std::float16_t
-| 57 = @complex_std_float32   // _Complex _Float32
-| 58 = @complex_float32x      // _Complex _Float32x
-| 59 = @complex_std_float64   // _Complex _Float64
-| 60 = @complex_float64x      // _Complex _Float64x
-| 61 = @complex_std_float128  // _Complex _Float128
-| 62 = @mfp8                  // __mfp8
-| 63 = @scalable_vector_count // __SVCount_t
-| 64 = @complex_fp16          // _Complex __fp16
-| 65 = @complex_std_bfloat16  // _Complex __bf16
-| 66 = @complex_std_float16   // _Complex std::float16_t
+| 52 = @float16                  // _Float16
+| 53 = @complex_float16          // _Complex _Float16
+| 54 = @fp16                     // __fp16
+| 55 = @std_bfloat16             // __bf16
+| 56 = @std_float16              // std::float16_t
+| 57 = @complex_std_float32      // _Complex _Float32
+| 58 = @complex_float32x         // _Complex _Float32x
+| 59 = @complex_std_float64      // _Complex _Float64
+| 60 = @complex_float64x         // _Complex _Float64x
+| 61 = @complex_std_float128     // _Complex _Float128
+| 62 = @mfp8                     // __mfp8
+| 63 = @scalable_vector_count    // __SVCount_t
+| 64 = @complex_fp16             // _Complex __fp16
+| 65 = @complex_std_bfloat16     // _Complex __bf16
+| 66 = @complex_std_float16      // _Complex std::float16_t
+| 67 = @bit_precise_int          // _BitInt(N)
+| 68 = @unsigned_bit_precise_int // unsigned _BitInt(N)
+| 69 = @signed_bit_precise_int   // signed _BitInt(N)
 ;
 
 builtintypes(
@@ -711,6 +714,11 @@ builtintypes(
     int alignment: int ref
 );
 
+bit_precise_int_types(
+    unique int id: @builtintype ref,
+    int bit_width: 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.
@@ -736,9 +744,11 @@ derivedtypes(
     int type_id: @type ref
 );
 
-pointerishsize(unique int id: @derivedtype ref,
+pointerishsize(
+    unique int id: @derivedtype ref,
     int size: int ref,
-    int alignment: int ref);
+    int alignment: int ref
+);
 
 arraysizes(
     unique int id: @derivedtype ref,

From 88c321368dcfa4b5b817f7dc5052a1028b853a74 Mon Sep 17 00:00:00 2001
From: Jeroen Ketema <jketema@github.com>
Date: Wed, 14 Oct 2026 12:04:31 +0200
Subject: [PATCH 2/4] C++: Add upgrade and downgrade scripts

---
 .../builtintypes.ql                           |    9 +
 .../old.dbscheme                              | 2588 +++++++++++++++++
 .../semmlecode.cpp.dbscheme                   | 2578 ++++++++++++++++
 .../upgrade.properties                        |    4 +
 .../old.dbscheme                              | 2578 ++++++++++++++++
 .../semmlecode.cpp.dbscheme                   | 2588 +++++++++++++++++
 .../upgrade.properties                        |    2 +
 7 files changed, 10347 insertions(+)
 create mode 100644 cpp/downgrades/6aec212e408fad907b19368a3376a4d9837783d2/builtintypes.ql
 create mode 100644 cpp/downgrades/6aec212e408fad907b19368a3376a4d9837783d2/old.dbscheme
 create mode 100644 cpp/downgrades/6aec212e408fad907b19368a3376a4d9837783d2/semmlecode.cpp.dbscheme
 create mode 100644 cpp/downgrades/6aec212e408fad907b19368a3376a4d9837783d2/upgrade.properties
 create mode 100644 cpp/ql/lib/upgrades/0853f43dc8c08deecb473c54a2b70da8597f1ab5/old.dbscheme
 create mode 100644 cpp/ql/lib/upgrades/0853f43dc8c08deecb473c54a2b70da8597f1ab5/semmlecode.cpp.dbscheme
 create mode 100644 cpp/ql/lib/upgrades/0853f43dc8c08deecb473c54a2b70da8597f1ab5/upgrade.properties

diff --git a/cpp/downgrades/6aec212e408fad907b19368a3376a4d9837783d2/builtintypes.ql b/cpp/downgrades/6aec212e408fad907b19368a3376a4d9837783d2/builtintypes.ql
new file mode 100644
index 000000000000..2ad09def291c
--- /dev/null
+++ b/cpp/downgrades/6aec212e408fad907b19368a3376a4d9837783d2/builtintypes.ql
@@ -0,0 +1,9 @@
+class BuiltInType extends @builtintype {
+  string toString() { none() }
+}
+
+from BuiltInType type, string name, int kind, int kind_new, int size, int sign, int alignment
+where
+  builtintypes(type, name, kind, size, sign, alignment) and
+  if kind in [67, 68, 69] then kind_new = 1 else kind_new = kind
+select type, name, kind_new, size, sign, alignment
diff --git a/cpp/downgrades/6aec212e408fad907b19368a3376a4d9837783d2/old.dbscheme b/cpp/downgrades/6aec212e408fad907b19368a3376a4d9837783d2/old.dbscheme
new file mode 100644
index 000000000000..6aec212e408f
--- /dev/null
+++ b/cpp/downgrades/6aec212e408fad907b19368a3376a4d9837783d2/old.dbscheme
@@ -0,0 +1,2588 @@
+
+/*- Compilations -*/
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- C++ dbscheme -*/
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+/**
+ * Gives the TRAP filename that `trap` is associated with.
+ * For debugging only.
+ */
+trap_filename(
+    int trap: @trap,
+    string filename: string ref
+);
+
+/**
+ * Gives the tag name for `tag`.
+ * For debugging only.
+ */
+tag_name(
+    int tag: @tag,
+    string name: string ref
+);
+
+@trap_or_tag = @tag | @trap;
+
+/**
+ * Gives the name for the source file.
+ */
+source_file_name(
+    int sf: @source_file,
+    string name: string ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that `source_file`
+ * (`/path/to/foo.c`) uses the TRAP file `trap_file`; i.e. it is the
+ * TRAP file corresponding to `foo.c`, something it transitively
+ * includes, or a template instantiation it transitively uses.
+ */
+source_file_uses_trap(
+    int source_file: @source_file ref,
+    int trap_file: @trap ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that the TRAP file
+ * `trap_file` uses tag `tag`.
+ */
+trap_uses_tag(
+    int trap_file: @trap ref,
+    int tag: @tag ref
+);
+
+/**
+ * Holds if there is a definition of `element` in TRAP file or tag `t`.
+ */
+in_trap_or_tag(
+    int element: @element ref,
+    int t: @trap_or_tag ref
+);
+
+pch_uses(
+    int pch: @pch ref,
+    int compilation: @compilation ref,
+    int id: @file ref
+)
+
+#keyset[pch, compilation]
+pch_creations(
+    int pch: @pch,
+    int compilation: @compilation ref,
+    int from: @file ref
+)
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location_default ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+case @function.kind of
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+builtin_functions(
+    int id: @function ref
+)
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float            // C99-specific _Complex float
+| 28 = @complex_double           // C99-specific _Complex double
+| 29 = @complex_long_double      // C99-specific _Complex long double
+| 30 = @imaginary_float          // C99-specific _Imaginary float
+| 31 = @imaginary_double         // C99-specific _Imaginary double
+| 32 = @imaginary_long_double    // C99-specific _Imaginary long double
+| 33 = @wchar_t                  // Microsoft-specific
+| 34 = @decltype_nullptr         // C++11
+| 35 = @int128                   // __int128
+| 36 = @unsigned_int128          // unsigned __int128
+| 37 = @signed_int128            // signed __int128
+| 38 = @float128                 // __float128
+| 39 = @complex_float128         // _Complex __float128
+// ... 40 _Decimal32
+// ... 41 _Decimal64
+// ... 42 _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32              // _Float32
+| 46 = @float32x                 // _Float32x
+| 47 = @std_float64              // _Float64
+| 48 = @float64x                 // _Float64x
+| 49 = @std_float128             // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16                  // _Float16
+| 53 = @complex_float16          // _Complex _Float16
+| 54 = @fp16                     // __fp16
+| 55 = @std_bfloat16             // __bf16
+| 56 = @std_float16              // std::float16_t
+| 57 = @complex_std_float32      // _Complex _Float32
+| 58 = @complex_float32x         // _Complex _Float32x
+| 59 = @complex_std_float64      // _Complex _Float64
+| 60 = @complex_float64x         // _Complex _Float64x
+| 61 = @complex_std_float128     // _Complex _Float128
+| 62 = @mfp8                     // __mfp8
+| 63 = @scalable_vector_count    // __SVCount_t
+| 64 = @complex_fp16             // _Complex __fp16
+| 65 = @complex_std_bfloat16     // _Complex __bf16
+| 66 = @complex_std_float16      // _Complex std::float16_t
+| 67 = @bit_precise_int          // _BitInt(N)
+| 68 = @unsigned_bit_precise_int // unsigned _BitInt(N)
+| 69 = @signed_bit_precise_int   // signed _BitInt(N)
+;
+
+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
+);
+
+bit_precise_int_types(
+    unique int id: @builtintype ref,
+    int bit_width: int ref
+)
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(
+    unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+class_template_generated_from(
+    unique int template: @usertype ref,
+    int from: @usertype ref
+)
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+function_template_generated_from(
+    unique int template: @function ref,
+    int from: @function 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
+);
+variable_template_generated_from(
+    unique int template: @variable ref,
+    int from: @variable ref
+);
+
+is_alias_template(unique int id: @usertype ref);
+alias_instantiation(
+    unique int to: @usertype ref,
+    int from: @usertype ref
+);
+alias_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+alias_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+alias_template_generated_from(
+    unique int template: @usertype ref,
+    int from: @usertype ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype
+                       | @decltype
+                       | @derivedtype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+| 394 = @isinvocable
+| 395 = @isnothrowinvocable
+| 396 = @isbitwisecloneable
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            | @isinvocable
+            | @isnothrowinvocable
+            | @isbitwisecloneable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+param_ref_to_this(
+    int expr: @param_ref ref
+)
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 17 = @ppd_embed
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+embeds(
+    unique int id: @ppd_embed ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
diff --git a/cpp/downgrades/6aec212e408fad907b19368a3376a4d9837783d2/semmlecode.cpp.dbscheme b/cpp/downgrades/6aec212e408fad907b19368a3376a4d9837783d2/semmlecode.cpp.dbscheme
new file mode 100644
index 000000000000..0853f43dc8c0
--- /dev/null
+++ b/cpp/downgrades/6aec212e408fad907b19368a3376a4d9837783d2/semmlecode.cpp.dbscheme
@@ -0,0 +1,2578 @@
+
+/*- Compilations -*/
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- C++ dbscheme -*/
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+/**
+ * Gives the TRAP filename that `trap` is associated with.
+ * For debugging only.
+ */
+trap_filename(
+    int trap: @trap,
+    string filename: string ref
+);
+
+/**
+ * Gives the tag name for `tag`.
+ * For debugging only.
+ */
+tag_name(
+    int tag: @tag,
+    string name: string ref
+);
+
+@trap_or_tag = @tag | @trap;
+
+/**
+ * Gives the name for the source file.
+ */
+source_file_name(
+    int sf: @source_file,
+    string name: string ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that `source_file`
+ * (`/path/to/foo.c`) uses the TRAP file `trap_file`; i.e. it is the
+ * TRAP file corresponding to `foo.c`, something it transitively
+ * includes, or a template instantiation it transitively uses.
+ */
+source_file_uses_trap(
+    int source_file: @source_file ref,
+    int trap_file: @trap ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that the TRAP file
+ * `trap_file` uses tag `tag`.
+ */
+trap_uses_tag(
+    int trap_file: @trap ref,
+    int tag: @tag ref
+);
+
+/**
+ * Holds if there is a definition of `element` in TRAP file or tag `t`.
+ */
+in_trap_or_tag(
+    int element: @element ref,
+    int t: @trap_or_tag ref
+);
+
+pch_uses(
+    int pch: @pch ref,
+    int compilation: @compilation ref,
+    int id: @file ref
+)
+
+#keyset[pch, compilation]
+pch_creations(
+    int pch: @pch,
+    int compilation: @compilation ref,
+    int from: @file ref
+)
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location_default ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+case @function.kind of
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+builtin_functions(
+    int id: @function ref
+)
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+// ... 40 _Decimal32
+// ... 41 _Decimal64
+// ... 42 _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
+| 63 = @scalable_vector_count // __SVCount_t
+| 64 = @complex_fp16          // _Complex __fp16
+| 65 = @complex_std_bfloat16  // _Complex __bf16
+| 66 = @complex_std_float16   // _Complex std::float16_t
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+class_template_generated_from(
+    unique int template: @usertype ref,
+    int from: @usertype ref
+)
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+function_template_generated_from(
+    unique int template: @function ref,
+    int from: @function 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
+);
+variable_template_generated_from(
+    unique int template: @variable ref,
+    int from: @variable ref
+);
+
+is_alias_template(unique int id: @usertype ref);
+alias_instantiation(
+    unique int to: @usertype ref,
+    int from: @usertype ref
+);
+alias_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+alias_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+alias_template_generated_from(
+    unique int template: @usertype ref,
+    int from: @usertype ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype
+                       | @decltype
+                       | @derivedtype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+| 394 = @isinvocable
+| 395 = @isnothrowinvocable
+| 396 = @isbitwisecloneable
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            | @isinvocable
+            | @isnothrowinvocable
+            | @isbitwisecloneable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+param_ref_to_this(
+    int expr: @param_ref ref
+)
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 17 = @ppd_embed
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+embeds(
+    unique int id: @ppd_embed ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
diff --git a/cpp/downgrades/6aec212e408fad907b19368a3376a4d9837783d2/upgrade.properties b/cpp/downgrades/6aec212e408fad907b19368a3376a4d9837783d2/upgrade.properties
new file mode 100644
index 000000000000..f387b03144f0
--- /dev/null
+++ b/cpp/downgrades/6aec212e408fad907b19368a3376a4d9837783d2/upgrade.properties
@@ -0,0 +1,4 @@
+description: Support C23 _BitInt
+compatibility: full
+bit_precise_int_types.rel: delete
+builtintypes.rel: run builtintypes.qlo
diff --git a/cpp/ql/lib/upgrades/0853f43dc8c08deecb473c54a2b70da8597f1ab5/old.dbscheme b/cpp/ql/lib/upgrades/0853f43dc8c08deecb473c54a2b70da8597f1ab5/old.dbscheme
new file mode 100644
index 000000000000..0853f43dc8c0
--- /dev/null
+++ b/cpp/ql/lib/upgrades/0853f43dc8c08deecb473c54a2b70da8597f1ab5/old.dbscheme
@@ -0,0 +1,2578 @@
+
+/*- Compilations -*/
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- C++ dbscheme -*/
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+/**
+ * Gives the TRAP filename that `trap` is associated with.
+ * For debugging only.
+ */
+trap_filename(
+    int trap: @trap,
+    string filename: string ref
+);
+
+/**
+ * Gives the tag name for `tag`.
+ * For debugging only.
+ */
+tag_name(
+    int tag: @tag,
+    string name: string ref
+);
+
+@trap_or_tag = @tag | @trap;
+
+/**
+ * Gives the name for the source file.
+ */
+source_file_name(
+    int sf: @source_file,
+    string name: string ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that `source_file`
+ * (`/path/to/foo.c`) uses the TRAP file `trap_file`; i.e. it is the
+ * TRAP file corresponding to `foo.c`, something it transitively
+ * includes, or a template instantiation it transitively uses.
+ */
+source_file_uses_trap(
+    int source_file: @source_file ref,
+    int trap_file: @trap ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that the TRAP file
+ * `trap_file` uses tag `tag`.
+ */
+trap_uses_tag(
+    int trap_file: @trap ref,
+    int tag: @tag ref
+);
+
+/**
+ * Holds if there is a definition of `element` in TRAP file or tag `t`.
+ */
+in_trap_or_tag(
+    int element: @element ref,
+    int t: @trap_or_tag ref
+);
+
+pch_uses(
+    int pch: @pch ref,
+    int compilation: @compilation ref,
+    int id: @file ref
+)
+
+#keyset[pch, compilation]
+pch_creations(
+    int pch: @pch,
+    int compilation: @compilation ref,
+    int from: @file ref
+)
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location_default ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+case @function.kind of
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+builtin_functions(
+    int id: @function ref
+)
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+// ... 40 _Decimal32
+// ... 41 _Decimal64
+// ... 42 _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
+| 63 = @scalable_vector_count // __SVCount_t
+| 64 = @complex_fp16          // _Complex __fp16
+| 65 = @complex_std_bfloat16  // _Complex __bf16
+| 66 = @complex_std_float16   // _Complex std::float16_t
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+class_template_generated_from(
+    unique int template: @usertype ref,
+    int from: @usertype ref
+)
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+function_template_generated_from(
+    unique int template: @function ref,
+    int from: @function 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
+);
+variable_template_generated_from(
+    unique int template: @variable ref,
+    int from: @variable ref
+);
+
+is_alias_template(unique int id: @usertype ref);
+alias_instantiation(
+    unique int to: @usertype ref,
+    int from: @usertype ref
+);
+alias_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+alias_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+alias_template_generated_from(
+    unique int template: @usertype ref,
+    int from: @usertype ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype
+                       | @decltype
+                       | @derivedtype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+| 394 = @isinvocable
+| 395 = @isnothrowinvocable
+| 396 = @isbitwisecloneable
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            | @isinvocable
+            | @isnothrowinvocable
+            | @isbitwisecloneable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+param_ref_to_this(
+    int expr: @param_ref ref
+)
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 17 = @ppd_embed
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+embeds(
+    unique int id: @ppd_embed ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
diff --git a/cpp/ql/lib/upgrades/0853f43dc8c08deecb473c54a2b70da8597f1ab5/semmlecode.cpp.dbscheme b/cpp/ql/lib/upgrades/0853f43dc8c08deecb473c54a2b70da8597f1ab5/semmlecode.cpp.dbscheme
new file mode 100644
index 000000000000..6aec212e408f
--- /dev/null
+++ b/cpp/ql/lib/upgrades/0853f43dc8c08deecb473c54a2b70da8597f1ab5/semmlecode.cpp.dbscheme
@@ -0,0 +1,2588 @@
+
+/*- Compilations -*/
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- C++ dbscheme -*/
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+/**
+ * Gives the TRAP filename that `trap` is associated with.
+ * For debugging only.
+ */
+trap_filename(
+    int trap: @trap,
+    string filename: string ref
+);
+
+/**
+ * Gives the tag name for `tag`.
+ * For debugging only.
+ */
+tag_name(
+    int tag: @tag,
+    string name: string ref
+);
+
+@trap_or_tag = @tag | @trap;
+
+/**
+ * Gives the name for the source file.
+ */
+source_file_name(
+    int sf: @source_file,
+    string name: string ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that `source_file`
+ * (`/path/to/foo.c`) uses the TRAP file `trap_file`; i.e. it is the
+ * TRAP file corresponding to `foo.c`, something it transitively
+ * includes, or a template instantiation it transitively uses.
+ */
+source_file_uses_trap(
+    int source_file: @source_file ref,
+    int trap_file: @trap ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that the TRAP file
+ * `trap_file` uses tag `tag`.
+ */
+trap_uses_tag(
+    int trap_file: @trap ref,
+    int tag: @tag ref
+);
+
+/**
+ * Holds if there is a definition of `element` in TRAP file or tag `t`.
+ */
+in_trap_or_tag(
+    int element: @element ref,
+    int t: @trap_or_tag ref
+);
+
+pch_uses(
+    int pch: @pch ref,
+    int compilation: @compilation ref,
+    int id: @file ref
+)
+
+#keyset[pch, compilation]
+pch_creations(
+    int pch: @pch,
+    int compilation: @compilation ref,
+    int from: @file ref
+)
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location_default ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+case @function.kind of
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+builtin_functions(
+    int id: @function ref
+)
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float            // C99-specific _Complex float
+| 28 = @complex_double           // C99-specific _Complex double
+| 29 = @complex_long_double      // C99-specific _Complex long double
+| 30 = @imaginary_float          // C99-specific _Imaginary float
+| 31 = @imaginary_double         // C99-specific _Imaginary double
+| 32 = @imaginary_long_double    // C99-specific _Imaginary long double
+| 33 = @wchar_t                  // Microsoft-specific
+| 34 = @decltype_nullptr         // C++11
+| 35 = @int128                   // __int128
+| 36 = @unsigned_int128          // unsigned __int128
+| 37 = @signed_int128            // signed __int128
+| 38 = @float128                 // __float128
+| 39 = @complex_float128         // _Complex __float128
+// ... 40 _Decimal32
+// ... 41 _Decimal64
+// ... 42 _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32              // _Float32
+| 46 = @float32x                 // _Float32x
+| 47 = @std_float64              // _Float64
+| 48 = @float64x                 // _Float64x
+| 49 = @std_float128             // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16                  // _Float16
+| 53 = @complex_float16          // _Complex _Float16
+| 54 = @fp16                     // __fp16
+| 55 = @std_bfloat16             // __bf16
+| 56 = @std_float16              // std::float16_t
+| 57 = @complex_std_float32      // _Complex _Float32
+| 58 = @complex_float32x         // _Complex _Float32x
+| 59 = @complex_std_float64      // _Complex _Float64
+| 60 = @complex_float64x         // _Complex _Float64x
+| 61 = @complex_std_float128     // _Complex _Float128
+| 62 = @mfp8                     // __mfp8
+| 63 = @scalable_vector_count    // __SVCount_t
+| 64 = @complex_fp16             // _Complex __fp16
+| 65 = @complex_std_bfloat16     // _Complex __bf16
+| 66 = @complex_std_float16      // _Complex std::float16_t
+| 67 = @bit_precise_int          // _BitInt(N)
+| 68 = @unsigned_bit_precise_int // unsigned _BitInt(N)
+| 69 = @signed_bit_precise_int   // signed _BitInt(N)
+;
+
+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
+);
+
+bit_precise_int_types(
+    unique int id: @builtintype ref,
+    int bit_width: int ref
+)
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(
+    unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+class_template_generated_from(
+    unique int template: @usertype ref,
+    int from: @usertype ref
+)
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+function_template_generated_from(
+    unique int template: @function ref,
+    int from: @function 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
+);
+variable_template_generated_from(
+    unique int template: @variable ref,
+    int from: @variable ref
+);
+
+is_alias_template(unique int id: @usertype ref);
+alias_instantiation(
+    unique int to: @usertype ref,
+    int from: @usertype ref
+);
+alias_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+alias_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+alias_template_generated_from(
+    unique int template: @usertype ref,
+    int from: @usertype ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype
+                       | @decltype
+                       | @derivedtype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+| 394 = @isinvocable
+| 395 = @isnothrowinvocable
+| 396 = @isbitwisecloneable
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            | @isinvocable
+            | @isnothrowinvocable
+            | @isbitwisecloneable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+param_ref_to_this(
+    int expr: @param_ref ref
+)
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 17 = @ppd_embed
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+embeds(
+    unique int id: @ppd_embed ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
diff --git a/cpp/ql/lib/upgrades/0853f43dc8c08deecb473c54a2b70da8597f1ab5/upgrade.properties b/cpp/ql/lib/upgrades/0853f43dc8c08deecb473c54a2b70da8597f1ab5/upgrade.properties
new file mode 100644
index 000000000000..92084ebe9ad6
--- /dev/null
+++ b/cpp/ql/lib/upgrades/0853f43dc8c08deecb473c54a2b70da8597f1ab5/upgrade.properties
@@ -0,0 +1,2 @@
+description: Support C23 _BitInt
+compatibility: partial

From 31758812c59a13b9cc71cc2fde0d7afcd34d5f63 Mon Sep 17 00:00:00 2001
From: Jeroen Ketema <jketema@github.com>
Date: Wed, 14 Oct 2026 12:06:49 +0200
Subject: [PATCH 3/4] C++: Add change note

---
 cpp/ql/lib/change-notes/2026-10-14-bitint.md | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 cpp/ql/lib/change-notes/2026-10-14-bitint.md

diff --git a/cpp/ql/lib/change-notes/2026-10-14-bitint.md b/cpp/ql/lib/change-notes/2026-10-14-bitint.md
new file mode 100644
index 000000000000..8e185b0dbdc8
--- /dev/null
+++ b/cpp/ql/lib/change-notes/2026-10-14-bitint.md
@@ -0,0 +1,4 @@
+---
+category: feature
+---
+* Added support for C23 bit-precise integers (`_BitInt(N)`).

From 75d1cb9ca21ae2eff590b3b05f3da8ce26b5daa1 Mon Sep 17 00:00:00 2001
From: Jeroen Ketema <jketema@github.com>
Date: Wed, 14 Oct 2026 15:51:46 +0200
Subject: [PATCH 4/4] C++: Update stats file

---
 cpp/ql/lib/semmlecode.cpp.dbscheme.stats | 7217 +++++++++++-----------
 1 file changed, 3636 insertions(+), 3581 deletions(-)

diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
index 54cdc7a85081..8f5c157b1ae7 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
@@ -2,7 +2,7 @@
     <typesizes>
         <e>
             <k>@compilation</k>
-            <v>12556</v>
+            <v>12799</v>
         </e>
         <e>
             <k>@externalDataElement</k>
@@ -10,19 +10,19 @@
         </e>
         <e>
             <k>@file</k>
-            <v>64766</v>
+            <v>66019</v>
         </e>
         <e>
             <k>@folder</k>
-            <v>12305</v>
+            <v>12543</v>
         </e>
         <e>
             <k>@diagnostic</k>
-            <v>356</v>
+            <v>363</v>
         </e>
         <e>
             <k>@location_default</k>
-            <v>46362405</v>
+            <v>46369281</v>
         </e>
         <e>
             <k>@trap</k>
@@ -42,15 +42,15 @@
         </e>
         <e>
             <k>@macro_expansion</k>
-            <v>40315722</v>
+            <v>40292589</v>
         </e>
         <e>
             <k>@other_macro_reference</k>
-            <v>300696</v>
+            <v>300524</v>
         </e>
         <e>
             <k>@normal_function</k>
-            <v>2699010</v>
+            <v>2699603</v>
         </e>
         <e>
             <k>@unknown_function</k>
@@ -58,19 +58,19 @@
         </e>
         <e>
             <k>@constructor</k>
-            <v>688614</v>
+            <v>692625</v>
         </e>
         <e>
             <k>@destructor</k>
-            <v>84823</v>
+            <v>84842</v>
         </e>
         <e>
             <k>@conversion_function</k>
-            <v>10188</v>
+            <v>10190</v>
         </e>
         <e>
             <k>@operator</k>
-            <v>647163</v>
+            <v>647305</v>
         </e>
         <e>
             <k>@user_defined_literal</k>
@@ -78,31 +78,31 @@
         </e>
         <e>
             <k>@deduction_guide</k>
-            <v>5769</v>
+            <v>5770</v>
         </e>
         <e>
             <k>@fun_decl</k>
-            <v>4148376</v>
+            <v>4149410</v>
         </e>
         <e>
             <k>@var_decl</k>
-            <v>9436285</v>
+            <v>9411101</v>
         </e>
         <e>
             <k>@type_decl</k>
-            <v>1639390</v>
+            <v>1639750</v>
         </e>
         <e>
             <k>@namespace_decl</k>
-            <v>405513</v>
+            <v>406675</v>
         </e>
         <e>
             <k>@using_declaration</k>
-            <v>265844</v>
+            <v>270974</v>
         </e>
         <e>
             <k>@using_directive</k>
-            <v>6377</v>
+            <v>6415</v>
         </e>
         <e>
             <k>@using_enum_declaration</k>
@@ -110,27 +110,27 @@
         </e>
         <e>
             <k>@static_assert</k>
-            <v>171628</v>
+            <v>172120</v>
         </e>
         <e>
             <k>@parameter</k>
-            <v>6930613</v>
+            <v>6932137</v>
         </e>
         <e>
             <k>@membervariable</k>
-            <v>1503078</v>
+            <v>1502215</v>
         </e>
         <e>
             <k>@globalvariable</k>
-            <v>661280</v>
+            <v>634536</v>
         </e>
         <e>
             <k>@localvariable</k>
-            <v>725852</v>
+            <v>733038</v>
         </e>
         <e>
             <k>@enumconstant</k>
-            <v>348112</v>
+            <v>347913</v>
         </e>
         <e>
             <k>@errortype</k>
@@ -364,37 +364,49 @@
             <k>@complex_std_float16</k>
             <v>122</v>
         </e>
+        <e>
+            <k>@bit_precise_int</k>
+            <v>3</v>
+        </e>
+        <e>
+            <k>@unsigned_bit_precise_int</k>
+            <v>4</v>
+        </e>
+        <e>
+            <k>@signed_bit_precise_int</k>
+            <v>1</v>
+        </e>
         <e>
             <k>@pointer</k>
-            <v>449159</v>
+            <v>449258</v>
         </e>
         <e>
             <k>@type_with_specifiers</k>
-            <v>686813</v>
+            <v>686964</v>
         </e>
         <e>
             <k>@array</k>
-            <v>89611</v>
+            <v>89630</v>
         </e>
         <e>
             <k>@routineptr</k>
-            <v>674281</v>
+            <v>678207</v>
         </e>
         <e>
             <k>@reference</k>
-            <v>958837</v>
+            <v>959048</v>
         </e>
         <e>
             <k>@gnu_vector</k>
-            <v>671</v>
+            <v>684</v>
         </e>
         <e>
             <k>@routinereference</k>
-            <v>369</v>
+            <v>371</v>
         </e>
         <e>
             <k>@rvalue_reference</k>
-            <v>286877</v>
+            <v>286941</v>
         </e>
         <e>
             <k>@block</k>
@@ -404,9 +416,13 @@
             <k>@scalable_vector</k>
             <v>1</v>
         </e>
+        <e>
+            <k>@decltype</k>
+            <v>101803</v>
+        </e>
         <e>
             <k>@typeof</k>
-            <v>812</v>
+            <v>811</v>
         </e>
         <e>
             <k>@underlying_type</k>
@@ -454,7 +470,7 @@
         </e>
         <e>
             <k>@remove_cv</k>
-            <v>2095</v>
+            <v>2098</v>
         </e>
         <e>
             <k>@remove_cvref</k>
@@ -482,31 +498,27 @@
         </e>
         <e>
             <k>@remove_reference</k>
-            <v>5688</v>
-        </e>
-        <e>
-            <k>@decltype</k>
-            <v>101861</v>
+            <v>5694</v>
         </e>
         <e>
             <k>@struct</k>
-            <v>1039206</v>
+            <v>1056586</v>
         </e>
         <e>
             <k>@union</k>
-            <v>20745</v>
+            <v>20750</v>
         </e>
         <e>
             <k>@enum</k>
-            <v>41614</v>
+            <v>41590</v>
         </e>
         <e>
             <k>@template_parameter</k>
-            <v>863096</v>
+            <v>879786</v>
         </e>
         <e>
             <k>@alias</k>
-            <v>1757610</v>
+            <v>1791267</v>
         </e>
         <e>
             <k>@unknown_usertype</k>
@@ -514,27 +526,27 @@
         </e>
         <e>
             <k>@class</k>
-            <v>320881</v>
+            <v>320951</v>
         </e>
         <e>
             <k>@template_template_parameter</k>
-            <v>6073</v>
+            <v>6191</v>
         </e>
         <e>
             <k>@proxy_class</k>
-            <v>50227</v>
+            <v>51198</v>
         </e>
         <e>
             <k>@scoped_enum</k>
-            <v>11416</v>
+            <v>11418</v>
         </e>
         <e>
             <k>@template_struct</k>
-            <v>210581</v>
+            <v>214653</v>
         </e>
         <e>
             <k>@template_class</k>
-            <v>28847</v>
+            <v>28853</v>
         </e>
         <e>
             <k>@template_union</k>
@@ -542,27 +554,27 @@
         </e>
         <e>
             <k>@mangledname</k>
-            <v>6352070</v>
+            <v>6345485</v>
         </e>
         <e>
             <k>@type_mention</k>
-            <v>5941339</v>
+            <v>5937930</v>
         </e>
         <e>
             <k>@concept_template</k>
-            <v>3592</v>
+            <v>3596</v>
         </e>
         <e>
             <k>@routinetype</k>
-            <v>595664</v>
+            <v>599125</v>
         </e>
         <e>
             <k>@ptrtomember</k>
-            <v>9651</v>
+            <v>9837</v>
         </e>
         <e>
             <k>@specifier</k>
-            <v>7610</v>
+            <v>7612</v>
         </e>
         <e>
             <k>@gnuattribute</k>
@@ -570,11 +582,11 @@
         </e>
         <e>
             <k>@stdattribute</k>
-            <v>347764</v>
+            <v>347840</v>
         </e>
         <e>
             <k>@declspec</k>
-            <v>330464</v>
+            <v>330275</v>
         </e>
         <e>
             <k>@msattribute</k>
@@ -582,19 +594,19 @@
         </e>
         <e>
             <k>@alignas</k>
-            <v>2164</v>
+            <v>2186</v>
         </e>
         <e>
             <k>@attribute_arg_token</k>
-            <v>16448</v>
+            <v>16545</v>
         </e>
         <e>
             <k>@attribute_arg_constant_expr</k>
-            <v>71688</v>
+            <v>72691</v>
         </e>
         <e>
             <k>@attribute_arg_expr</k>
-            <v>1582</v>
+            <v>1584</v>
         </e>
         <e>
             <k>@attribute_arg_empty</k>
@@ -606,23 +618,23 @@
         </e>
         <e>
             <k>@attribute_arg_type</k>
-            <v>460</v>
+            <v>464</v>
         </e>
         <e>
             <k>@derivation</k>
-            <v>492610</v>
+            <v>494887</v>
         </e>
         <e>
             <k>@frienddecl</k>
-            <v>761457</v>
+            <v>765587</v>
         </e>
         <e>
             <k>@comment</k>
-            <v>11056034</v>
+            <v>11058465</v>
         </e>
         <e>
             <k>@namespace</k>
-            <v>8591</v>
+            <v>8757</v>
         </e>
         <e>
             <k>@specialnamequalifyingelement</k>
@@ -630,15 +642,15 @@
         </e>
         <e>
             <k>@namequalifier</k>
-            <v>3050545</v>
+            <v>3044887</v>
         </e>
         <e>
             <k>@value</k>
-            <v>13547098</v>
+            <v>13539325</v>
         </e>
         <e>
             <k>@initialiser</k>
-            <v>2289023</v>
+            <v>2292690</v>
         </e>
         <e>
             <k>@address_of</k>
@@ -646,131 +658,131 @@
         </e>
         <e>
             <k>@indirect</k>
-            <v>401998</v>
+            <v>401768</v>
         </e>
         <e>
             <k>@array_to_pointer</k>
-            <v>1954311</v>
+            <v>1953190</v>
         </e>
         <e>
             <k>@parexpr</k>
-            <v>4916613</v>
+            <v>4913791</v>
         </e>
         <e>
             <k>@arithnegexpr</k>
-            <v>586702</v>
+            <v>586365</v>
         </e>
         <e>
             <k>@unaryplusexpr</k>
-            <v>4117</v>
+            <v>4158</v>
         </e>
         <e>
             <k>@complementexpr</k>
-            <v>38195</v>
+            <v>38173</v>
         </e>
         <e>
             <k>@notexpr</k>
-            <v>355868</v>
+            <v>355664</v>
         </e>
         <e>
             <k>@postincrexpr</k>
-            <v>84590</v>
+            <v>84542</v>
         </e>
         <e>
             <k>@postdecrexpr</k>
-            <v>57409</v>
+            <v>57376</v>
         </e>
         <e>
             <k>@preincrexpr</k>
-            <v>96742</v>
+            <v>96686</v>
         </e>
         <e>
             <k>@predecrexpr</k>
-            <v>35831</v>
+            <v>35810</v>
         </e>
         <e>
             <k>@conditionalexpr</k>
-            <v>898137</v>
+            <v>897622</v>
         </e>
         <e>
             <k>@addexpr</k>
-            <v>581041</v>
+            <v>580708</v>
         </e>
         <e>
             <k>@subexpr</k>
-            <v>466933</v>
+            <v>466665</v>
         </e>
         <e>
             <k>@mulexpr</k>
-            <v>445548</v>
+            <v>445292</v>
         </e>
         <e>
             <k>@divexpr</k>
-            <v>52399</v>
+            <v>52369</v>
         </e>
         <e>
             <k>@remexpr</k>
-            <v>15776</v>
+            <v>15870</v>
         </e>
         <e>
             <k>@paddexpr</k>
-            <v>118654</v>
+            <v>118586</v>
         </e>
         <e>
             <k>@psubexpr</k>
-            <v>68032</v>
+            <v>67993</v>
         </e>
         <e>
             <k>@pdiffexpr</k>
-            <v>42841</v>
+            <v>43833</v>
         </e>
         <e>
             <k>@lshiftexpr</k>
-            <v>552490</v>
+            <v>552173</v>
         </e>
         <e>
             <k>@rshiftexpr</k>
-            <v>201483</v>
+            <v>201367</v>
         </e>
         <e>
             <k>@andexpr</k>
-            <v>483730</v>
+            <v>483452</v>
         </e>
         <e>
             <k>@orexpr</k>
-            <v>194110</v>
+            <v>193999</v>
         </e>
         <e>
             <k>@xorexpr</k>
-            <v>73969</v>
+            <v>73926</v>
         </e>
         <e>
             <k>@eqexpr</k>
-            <v>643558</v>
+            <v>643188</v>
         </e>
         <e>
             <k>@neexpr</k>
-            <v>411988</v>
+            <v>411752</v>
         </e>
         <e>
             <k>@gtexpr</k>
-            <v>111181</v>
+            <v>111117</v>
         </e>
         <e>
             <k>@ltexpr</k>
-            <v>139469</v>
+            <v>139389</v>
         </e>
         <e>
             <k>@geexpr</k>
-            <v>81322</v>
+            <v>81275</v>
         </e>
         <e>
             <k>@leexpr</k>
-            <v>291998</v>
+            <v>291831</v>
         </e>
         <e>
             <k>@assignexpr</k>
-            <v>1281515</v>
+            <v>1280779</v>
         </e>
         <e>
             <k>@assignaddexpr</k>
@@ -778,15 +790,15 @@
         </e>
         <e>
             <k>@assignsubexpr</k>
-            <v>15312</v>
+            <v>15303</v>
         </e>
         <e>
             <k>@assignmulexpr</k>
-            <v>11109</v>
+            <v>11324</v>
         </e>
         <e>
             <k>@assigndivexpr</k>
-            <v>6808</v>
+            <v>6804</v>
         </e>
         <e>
             <k>@assignremexpr</k>
@@ -794,7 +806,7 @@
         </e>
         <e>
             <k>@assignlshiftexpr</k>
-            <v>3703</v>
+            <v>3701</v>
         </e>
         <e>
             <k>@assignrshiftexpr</k>
@@ -802,127 +814,127 @@
         </e>
         <e>
             <k>@assignandexpr</k>
-            <v>6530</v>
+            <v>6526</v>
         </e>
         <e>
             <k>@assignorexpr</k>
-            <v>19612</v>
+            <v>19601</v>
         </e>
         <e>
             <k>@assignxorexpr</k>
-            <v>29905</v>
+            <v>29888</v>
         </e>
         <e>
             <k>@assignpaddexpr</k>
-            <v>18633</v>
+            <v>18622</v>
         </e>
         <e>
             <k>@assignpsubexpr</k>
-            <v>1576</v>
+            <v>1575</v>
         </e>
         <e>
             <k>@andlogicalexpr</k>
-            <v>346689</v>
+            <v>346490</v>
         </e>
         <e>
             <k>@orlogicalexpr</k>
-            <v>1103855</v>
+            <v>1103221</v>
         </e>
         <e>
             <k>@commaexpr</k>
-            <v>165227</v>
+            <v>165264</v>
         </e>
         <e>
             <k>@subscriptexpr</k>
-            <v>435268</v>
+            <v>435018</v>
         </e>
         <e>
             <k>@callexpr</k>
-            <v>261260</v>
+            <v>263482</v>
         </e>
         <e>
             <k>@vastartexpr</k>
-            <v>5007</v>
+            <v>5021</v>
         </e>
         <e>
             <k>@vaargexpr</k>
-            <v>1303</v>
+            <v>1302</v>
         </e>
         <e>
             <k>@vaendexpr</k>
-            <v>2941</v>
+            <v>2939</v>
         </e>
         <e>
             <k>@vacopyexpr</k>
-            <v>134</v>
+            <v>135</v>
         </e>
         <e>
             <k>@varaccess</k>
-            <v>8257017</v>
+            <v>8252279</v>
         </e>
         <e>
             <k>@runtime_sizeof</k>
-            <v>401820</v>
+            <v>401589</v>
         </e>
         <e>
             <k>@runtime_alignof</k>
-            <v>50352</v>
+            <v>50650</v>
         </e>
         <e>
             <k>@expr_stmt</k>
-            <v>147669</v>
+            <v>147584</v>
         </e>
         <e>
             <k>@routineexpr</k>
-            <v>5708356</v>
+            <v>5708751</v>
         </e>
         <e>
             <k>@type_operand</k>
-            <v>1405785</v>
+            <v>1404979</v>
         </e>
         <e>
             <k>@offsetofexpr</k>
-            <v>148579</v>
+            <v>148494</v>
         </e>
         <e>
             <k>@typescompexpr</k>
-            <v>702145</v>
+            <v>701742</v>
         </e>
         <e>
             <k>@literal</k>
-            <v>8057470</v>
+            <v>8035745</v>
         </e>
         <e>
             <k>@aggregateliteral</k>
-            <v>1397495</v>
+            <v>1400988</v>
         </e>
         <e>
             <k>@c_style_cast</k>
-            <v>6028638</v>
+            <v>6023777</v>
         </e>
         <e>
             <k>@temp_init</k>
-            <v>974536</v>
+            <v>984852</v>
         </e>
         <e>
             <k>@errorexpr</k>
-            <v>44841</v>
+            <v>45078</v>
         </e>
         <e>
             <k>@reference_to</k>
-            <v>1869126</v>
+            <v>1891026</v>
         </e>
         <e>
             <k>@ref_indirect</k>
-            <v>2079573</v>
+            <v>2091992</v>
         </e>
         <e>
             <k>@vacuous_destructor_call</k>
-            <v>7720</v>
+            <v>7766</v>
         </e>
         <e>
             <k>@assume</k>
-            <v>4150</v>
+            <v>4162</v>
         </e>
         <e>
             <k>@conjugation</k>
@@ -930,11 +942,11 @@
         </e>
         <e>
             <k>@realpartexpr</k>
-            <v>73</v>
+            <v>74</v>
         </e>
         <e>
             <k>@imagpartexpr</k>
-            <v>73</v>
+            <v>74</v>
         </e>
         <e>
             <k>@jmulexpr</k>
@@ -974,31 +986,31 @@
         </e>
         <e>
             <k>@thisaccess</k>
-            <v>1549814</v>
+            <v>1554385</v>
         </e>
         <e>
             <k>@new_expr</k>
-            <v>45518</v>
+            <v>45787</v>
         </e>
         <e>
             <k>@delete_expr</k>
-            <v>11312</v>
+            <v>11379</v>
         </e>
         <e>
             <k>@throw_expr</k>
-            <v>23607</v>
+            <v>23913</v>
         </e>
         <e>
             <k>@condition_decl</k>
-            <v>406398</v>
+            <v>406885</v>
         </e>
         <e>
             <k>@braced_init_list</k>
-            <v>2092</v>
+            <v>2114</v>
         </e>
         <e>
             <k>@type_id</k>
-            <v>47196</v>
+            <v>47476</v>
         </e>
         <e>
             <k>@sizeof_pack</k>
@@ -1030,7 +1042,7 @@
         </e>
         <e>
             <k>@hastrivialconstr</k>
-            <v>7</v>
+            <v>3</v>
         </e>
         <e>
             <k>@hastrivialcopy</k>
@@ -1054,7 +1066,7 @@
         </e>
         <e>
             <k>@isclassexpr</k>
-            <v>2374</v>
+            <v>2381</v>
         </e>
         <e>
             <k>@isconvtoexpr</k>
@@ -1062,15 +1074,15 @@
         </e>
         <e>
             <k>@isemptyexpr</k>
-            <v>8715</v>
+            <v>8717</v>
         </e>
         <e>
             <k>@isenumexpr</k>
-            <v>2946</v>
+            <v>2332</v>
         </e>
         <e>
             <k>@ispodexpr</k>
-            <v>828</v>
+            <v>844</v>
         </e>
         <e>
             <k>@ispolyexpr</k>
@@ -1086,83 +1098,83 @@
         </e>
         <e>
             <k>@hastrivialdestructor</k>
-            <v>2752</v>
+            <v>776</v>
         </e>
         <e>
             <k>@uuidof</k>
-            <v>26214</v>
+            <v>26289</v>
         </e>
         <e>
             <k>@delete_array_expr</k>
-            <v>1237</v>
+            <v>1261</v>
         </e>
         <e>
             <k>@new_array_expr</k>
-            <v>6597</v>
+            <v>6616</v>
         </e>
         <e>
             <k>@foldexpr</k>
-            <v>1261</v>
+            <v>1263</v>
         </e>
         <e>
             <k>@ctordirectinit</k>
-            <v>111177</v>
+            <v>111802</v>
         </e>
         <e>
             <k>@ctorvirtualinit</k>
-            <v>3961</v>
+            <v>3984</v>
         </e>
         <e>
             <k>@ctorfieldinit</k>
-            <v>202913</v>
+            <v>204063</v>
         </e>
         <e>
             <k>@ctordelegatinginit</k>
-            <v>3559</v>
+            <v>3560</v>
         </e>
         <e>
             <k>@dtordirectdestruct</k>
-            <v>38871</v>
+            <v>39102</v>
         </e>
         <e>
             <k>@dtorvirtualdestruct</k>
-            <v>3927</v>
+            <v>3950</v>
         </e>
         <e>
             <k>@dtorfielddestruct</k>
-            <v>39241</v>
+            <v>39473</v>
         </e>
         <e>
             <k>@static_cast</k>
-            <v>346536</v>
+            <v>348331</v>
         </e>
         <e>
             <k>@reinterpret_cast</k>
-            <v>39434</v>
+            <v>39547</v>
         </e>
         <e>
             <k>@const_cast</k>
-            <v>24101</v>
+            <v>24244</v>
         </e>
         <e>
             <k>@dynamic_cast</k>
-            <v>786</v>
+            <v>801</v>
         </e>
         <e>
             <k>@lambdaexpr</k>
-            <v>18970</v>
+            <v>19024</v>
         </e>
         <e>
             <k>@param_ref</k>
-            <v>163542</v>
+            <v>165240</v>
         </e>
         <e>
             <k>@noopexpr</k>
-            <v>80</v>
+            <v>113</v>
         </e>
         <e>
             <k>@istriviallyconstructibleexpr</k>
-            <v>3682</v>
+            <v>2332</v>
         </e>
         <e>
             <k>@isdestructibleexpr</k>
@@ -1178,15 +1190,15 @@
         </e>
         <e>
             <k>@istriviallyassignableexpr</k>
-            <v>3682</v>
+            <v>2332</v>
         </e>
         <e>
             <k>@isnothrowassignableexpr</k>
-            <v>5032</v>
+            <v>5034</v>
         </e>
         <e>
             <k>@istrivialexpr</k>
-            <v>3310</v>
+            <v>1249</v>
         </e>
         <e>
             <k>@isstandardlayoutexpr</k>
@@ -1214,11 +1226,11 @@
         </e>
         <e>
             <k>@isconstructibleexpr</k>
-            <v>3559</v>
+            <v>3560</v>
         </e>
         <e>
             <k>@isnothrowconstructibleexpr</k>
-            <v>20377</v>
+            <v>20381</v>
         </e>
         <e>
             <k>@hasfinalizerexpr</k>
@@ -1254,11 +1266,11 @@
         </e>
         <e>
             <k>@isfinalexpr</k>
-            <v>9264</v>
+            <v>9319</v>
         </e>
         <e>
             <k>@noexceptexpr</k>
-            <v>30169</v>
+            <v>30482</v>
         </e>
         <e>
             <k>@builtinshufflevector</k>
@@ -1266,11 +1278,11 @@
         </e>
         <e>
             <k>@builtinchooseexpr</k>
-            <v>20614</v>
+            <v>20602</v>
         </e>
         <e>
             <k>@builtinaddressof</k>
-            <v>15221</v>
+            <v>15224</v>
         </e>
         <e>
             <k>@vec_fill</k>
@@ -1286,7 +1298,7 @@
         </e>
         <e>
             <k>@spaceshipexpr</k>
-            <v>1347</v>
+            <v>1348</v>
         </e>
         <e>
             <k>@co_await</k>
@@ -1314,7 +1326,7 @@
         </e>
         <e>
             <k>@builtinshuffle</k>
-            <v>608</v>
+            <v>620</v>
         </e>
         <e>
             <k>@blockassignexpr</k>
@@ -1322,7 +1334,7 @@
         </e>
         <e>
             <k>@issame</k>
-            <v>4511</v>
+            <v>4517</v>
         </e>
         <e>
             <k>@isfunction</k>
@@ -1430,7 +1442,7 @@
         </e>
         <e>
             <k>@reuseexpr</k>
-            <v>841815</v>
+            <v>842823</v>
         </e>
         <e>
             <k>@istriviallycopyassignable</k>
@@ -1526,23 +1538,23 @@
         </e>
         <e>
             <k>@c11_generic</k>
-            <v>29973</v>
+            <v>29956</v>
         </e>
         <e>
             <k>@requires_expr</k>
-            <v>16401</v>
+            <v>16421</v>
         </e>
         <e>
             <k>@nested_requirement</k>
-            <v>684</v>
+            <v>685</v>
         </e>
         <e>
             <k>@compound_requirement</k>
-            <v>10884</v>
+            <v>10897</v>
         </e>
         <e>
             <k>@concept_id</k>
-            <v>90068</v>
+            <v>90176</v>
         </e>
         <e>
             <k>@isinvocable</k>
@@ -1558,79 +1570,79 @@
         </e>
         <e>
             <k>@lambdacapture</k>
-            <v>31810</v>
+            <v>31901</v>
         </e>
         <e>
             <k>@stmt_expr</k>
-            <v>2032201</v>
+            <v>2031035</v>
         </e>
         <e>
             <k>@stmt_if</k>
-            <v>990500</v>
+            <v>989932</v>
         </e>
         <e>
             <k>@stmt_while</k>
-            <v>39659</v>
+            <v>39636</v>
         </e>
         <e>
             <k>@stmt_goto</k>
-            <v>156829</v>
+            <v>159862</v>
         </e>
         <e>
             <k>@stmt_label</k>
-            <v>77512</v>
+            <v>79011</v>
         </e>
         <e>
             <k>@stmt_return</k>
-            <v>1233370</v>
+            <v>1257082</v>
         </e>
         <e>
             <k>@stmt_block</k>
-            <v>1695980</v>
+            <v>1707526</v>
         </e>
         <e>
             <k>@stmt_end_test_while</k>
-            <v>232528</v>
+            <v>232395</v>
         </e>
         <e>
             <k>@stmt_for</k>
-            <v>84413</v>
+            <v>84365</v>
         </e>
         <e>
             <k>@stmt_switch_case</k>
-            <v>830952</v>
+            <v>831947</v>
         </e>
         <e>
             <k>@stmt_switch</k>
-            <v>409306</v>
+            <v>409797</v>
         </e>
         <e>
             <k>@stmt_asm</k>
-            <v>63893</v>
+            <v>63856</v>
         </e>
         <e>
             <k>@stmt_decl</k>
-            <v>770162</v>
+            <v>772377</v>
         </e>
         <e>
             <k>@stmt_empty</k>
-            <v>426756</v>
+            <v>427267</v>
         </e>
         <e>
             <k>@stmt_continue</k>
-            <v>28099</v>
+            <v>28083</v>
         </e>
         <e>
             <k>@stmt_break</k>
-            <v>137217</v>
+            <v>137610</v>
         </e>
         <e>
             <k>@stmt_try_block</k>
-            <v>26230</v>
+            <v>26563</v>
         </e>
         <e>
             <k>@stmt_microsoft_try</k>
-            <v>209</v>
+            <v>210</v>
         </e>
         <e>
             <k>@stmt_set_vla_size</k>
@@ -1642,19 +1654,19 @@
         </e>
         <e>
             <k>@stmt_assigned_goto</k>
-            <v>12425</v>
+            <v>12418</v>
         </e>
         <e>
             <k>@stmt_range_based_for</k>
-            <v>6157</v>
+            <v>6221</v>
         </e>
         <e>
             <k>@stmt_handler</k>
-            <v>42985</v>
+            <v>43492</v>
         </e>
         <e>
             <k>@stmt_constexpr_if</k>
-            <v>103236</v>
+            <v>103259</v>
         </e>
         <e>
             <k>@stmt_co_return</k>
@@ -1674,51 +1686,51 @@
         </e>
         <e>
             <k>@ppd_if</k>
-            <v>581489</v>
+            <v>581617</v>
         </e>
         <e>
             <k>@ppd_ifdef</k>
-            <v>214425</v>
+            <v>214302</v>
         </e>
         <e>
             <k>@ppd_ifndef</k>
-            <v>160411</v>
+            <v>160319</v>
         </e>
         <e>
             <k>@ppd_elif</k>
-            <v>21767</v>
+            <v>22188</v>
         </e>
         <e>
             <k>@ppd_else</k>
-            <v>231147</v>
+            <v>231198</v>
         </e>
         <e>
             <k>@ppd_endif</k>
-            <v>874750</v>
+            <v>874943</v>
         </e>
         <e>
             <k>@ppd_plain_include</k>
-            <v>316386</v>
+            <v>322504</v>
         </e>
         <e>
             <k>@ppd_define</k>
-            <v>2706007</v>
+            <v>2706601</v>
         </e>
         <e>
             <k>@ppd_undef</k>
-            <v>98817</v>
+            <v>98839</v>
         </e>
         <e>
             <k>@ppd_pragma</k>
-            <v>399689</v>
+            <v>399777</v>
         </e>
         <e>
             <k>@ppd_include_next</k>
-            <v>167</v>
+            <v>168</v>
         </e>
         <e>
             <k>@ppd_line</k>
-            <v>18810</v>
+            <v>18996</v>
         </e>
         <e>
             <k>@ppd_error</k>
@@ -1750,7 +1762,7 @@
         </e>
         <e>
             <k>@link_target</k>
-            <v>817</v>
+            <v>816</v>
         </e>
         <e>
             <k>@xmldtd</k>
@@ -1780,11 +1792,11 @@
     <stats>
         <relation>
             <name>compilations</name>
-            <cardinality>12556</cardinality>
+            <cardinality>12799</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12556</v>
+                    <v>12799</v>
                 </e>
                 <e>
                     <k>cwd</k>
@@ -1802,7 +1814,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12556</v>
+                                    <v>12799</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1828,19 +1840,19 @@
         </relation>
         <relation>
             <name>compilation_args</name>
-            <cardinality>1005291</cardinality>
+            <cardinality>1024731</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12556</v>
+                    <v>12799</v>
                 </e>
                 <e>
                     <k>num</k>
-                    <v>1458</v>
+                    <v>1486</v>
                 </e>
                 <e>
                     <k>arg</k>
-                    <v>29068</v>
+                    <v>29630</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -1854,77 +1866,77 @@
                                 <b>
                                     <a>36</a>
                                     <b>42</b>
-                                    <v>996</v>
+                                    <v>1015</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>43</b>
-                                    <v>1090</v>
+                                    <v>1112</v>
                                 </b>
                                 <b>
                                     <a>43</a>
                                     <b>44</b>
-                                    <v>713</v>
+                                    <v>727</v>
                                 </b>
                                 <b>
                                     <a>44</a>
                                     <b>45</b>
-                                    <v>503</v>
+                                    <v>513</v>
                                 </b>
                                 <b>
                                     <a>45</a>
                                     <b>51</b>
-                                    <v>944</v>
+                                    <v>962</v>
                                 </b>
                                 <b>
                                     <a>51</a>
                                     <b>70</b>
-                                    <v>482</v>
+                                    <v>491</v>
                                 </b>
                                 <b>
                                     <a>71</a>
                                     <b>72</b>
-                                    <v>702</v>
+                                    <v>716</v>
                                 </b>
                                 <b>
                                     <a>72</a>
                                     <b>90</b>
-                                    <v>891</v>
+                                    <v>908</v>
                                 </b>
                                 <b>
                                     <a>94</a>
                                     <b>96</b>
-                                    <v>388</v>
+                                    <v>395</v>
                                 </b>
                                 <b>
                                     <a>98</a>
                                     <b>99</b>
-                                    <v>1332</v>
+                                    <v>1358</v>
                                 </b>
                                 <b>
                                     <a>100</a>
                                     <b>102</b>
-                                    <v>94</v>
+                                    <v>96</v>
                                 </b>
                                 <b>
                                     <a>103</a>
                                     <b>104</b>
-                                    <v>1982</v>
+                                    <v>2020</v>
                                 </b>
                                 <b>
                                     <a>104</a>
                                     <b>119</b>
-                                    <v>1059</v>
+                                    <v>1080</v>
                                 </b>
                                 <b>
                                     <a>120</a>
                                     <b>138</b>
-                                    <v>923</v>
+                                    <v>940</v>
                                 </b>
                                 <b>
                                     <a>139</a>
                                     <b>140</b>
-                                    <v>451</v>
+                                    <v>459</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1940,67 +1952,67 @@
                                 <b>
                                     <a>34</a>
                                     <b>38</b>
-                                    <v>587</v>
+                                    <v>598</v>
                                 </b>
                                 <b>
                                     <a>38</a>
                                     <b>39</b>
-                                    <v>1489</v>
+                                    <v>1518</v>
                                 </b>
                                 <b>
                                     <a>39</a>
                                     <b>40</b>
-                                    <v>975</v>
+                                    <v>994</v>
                                 </b>
                                 <b>
                                     <a>40</a>
                                     <b>42</b>
-                                    <v>1080</v>
+                                    <v>1101</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>53</b>
-                                    <v>597</v>
+                                    <v>609</v>
                                 </b>
                                 <b>
                                     <a>53</a>
                                     <b>54</b>
-                                    <v>702</v>
+                                    <v>716</v>
                                 </b>
                                 <b>
                                     <a>54</a>
                                     <b>63</b>
-                                    <v>891</v>
+                                    <v>908</v>
                                 </b>
                                 <b>
                                     <a>64</a>
                                     <b>67</b>
-                                    <v>398</v>
+                                    <v>406</v>
                                 </b>
                                 <b>
                                     <a>67</a>
                                     <b>68</b>
-                                    <v>1395</v>
+                                    <v>1422</v>
                                 </b>
                                 <b>
                                     <a>68</a>
                                     <b>70</b>
-                                    <v>965</v>
+                                    <v>983</v>
                                 </b>
                                 <b>
                                     <a>70</a>
                                     <b>71</b>
-                                    <v>1395</v>
+                                    <v>1422</v>
                                 </b>
                                 <b>
                                     <a>73</a>
                                     <b>79</b>
-                                    <v>944</v>
+                                    <v>962</v>
                                 </b>
                                 <b>
                                     <a>79</a>
                                     <b>89</b>
-                                    <v>1122</v>
+                                    <v>1144</v>
                                 </b>
                                 <b>
                                     <a>89</a>
@@ -2021,57 +2033,57 @@
                                 <b>
                                     <a>43</a>
                                     <b>90</b>
-                                    <v>62</v>
+                                    <v>64</v>
                                 </b>
                                 <b>
                                     <a>90</a>
                                     <b>108</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>108</a>
                                     <b>183</b>
-                                    <v>104</v>
+                                    <v>106</v>
                                 </b>
                                 <b>
                                     <a>198</a>
                                     <b>422</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>422</a>
                                     <b>595</b>
-                                    <v>125</v>
+                                    <v>128</v>
                                 </b>
                                 <b>
                                     <a>595</a>
                                     <b>605</b>
-                                    <v>125</v>
+                                    <v>128</v>
                                 </b>
                                 <b>
                                     <a>605</a>
                                     <b>749</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>750</a>
                                     <b>778</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>781</a>
                                     <b>883</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>930</a>
                                     <b>1190</b>
-                                    <v>83</v>
+                                    <v>85</v>
                                 </b>
                                 <b>
                                     <a>1197</a>
                                     <b>1198</b>
-                                    <v>377</v>
+                                    <v>384</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2087,72 +2099,72 @@
                                 <b>
                                     <a>1</a>
                                     <b>5</b>
-                                    <v>125</v>
+                                    <v>128</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>12</b>
-                                    <v>73</v>
+                                    <v>74</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>15</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>18</b>
-                                    <v>94</v>
+                                    <v>96</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>22</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>22</a>
                                     <b>27</b>
-                                    <v>125</v>
+                                    <v>128</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>29</b>
-                                    <v>83</v>
+                                    <v>85</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>34</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>34</a>
                                     <b>44</b>
-                                    <v>125</v>
+                                    <v>128</v>
                                 </b>
                                 <b>
                                     <a>45</a>
                                     <b>63</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>67</a>
                                     <b>94</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>94</a>
                                     <b>164</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>171</a>
                                     <b>199</b>
-                                    <v>20</v>
+                                    <v>21</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2168,22 +2180,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13312</v>
+                                    <v>13569</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12598</v>
+                                    <v>12842</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>103</b>
-                                    <v>2181</v>
+                                    <v>2224</v>
                                 </b>
                                 <b>
                                     <a>104</a>
                                     <b>1198</b>
-                                    <v>975</v>
+                                    <v>994</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2199,17 +2211,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19249</v>
+                                    <v>19621</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8664</v>
+                                    <v>8832</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>62</b>
-                                    <v>1153</v>
+                                    <v>1176</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2219,19 +2231,19 @@
         </relation>
         <relation>
             <name>compilation_expanded_args</name>
-            <cardinality>1005291</cardinality>
+            <cardinality>1024731</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12556</v>
+                    <v>12799</v>
                 </e>
                 <e>
                     <k>num</k>
-                    <v>1458</v>
+                    <v>1486</v>
                 </e>
                 <e>
                     <k>arg</k>
-                    <v>29068</v>
+                    <v>29630</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2245,77 +2257,77 @@
                                 <b>
                                     <a>36</a>
                                     <b>42</b>
-                                    <v>996</v>
+                                    <v>1015</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>43</b>
-                                    <v>1090</v>
+                                    <v>1112</v>
                                 </b>
                                 <b>
                                     <a>43</a>
                                     <b>44</b>
-                                    <v>713</v>
+                                    <v>727</v>
                                 </b>
                                 <b>
                                     <a>44</a>
                                     <b>45</b>
-                                    <v>503</v>
+                                    <v>513</v>
                                 </b>
                                 <b>
                                     <a>45</a>
                                     <b>51</b>
-                                    <v>944</v>
+                                    <v>962</v>
                                 </b>
                                 <b>
                                     <a>51</a>
                                     <b>70</b>
-                                    <v>482</v>
+                                    <v>491</v>
                                 </b>
                                 <b>
                                     <a>71</a>
                                     <b>72</b>
-                                    <v>702</v>
+                                    <v>716</v>
                                 </b>
                                 <b>
                                     <a>72</a>
                                     <b>90</b>
-                                    <v>891</v>
+                                    <v>908</v>
                                 </b>
                                 <b>
                                     <a>94</a>
                                     <b>96</b>
-                                    <v>388</v>
+                                    <v>395</v>
                                 </b>
                                 <b>
                                     <a>98</a>
                                     <b>99</b>
-                                    <v>1332</v>
+                                    <v>1358</v>
                                 </b>
                                 <b>
                                     <a>100</a>
                                     <b>102</b>
-                                    <v>94</v>
+                                    <v>96</v>
                                 </b>
                                 <b>
                                     <a>103</a>
                                     <b>104</b>
-                                    <v>1982</v>
+                                    <v>2020</v>
                                 </b>
                                 <b>
                                     <a>104</a>
                                     <b>119</b>
-                                    <v>1059</v>
+                                    <v>1080</v>
                                 </b>
                                 <b>
                                     <a>120</a>
                                     <b>138</b>
-                                    <v>923</v>
+                                    <v>940</v>
                                 </b>
                                 <b>
                                     <a>139</a>
                                     <b>140</b>
-                                    <v>451</v>
+                                    <v>459</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2331,67 +2343,67 @@
                                 <b>
                                     <a>34</a>
                                     <b>38</b>
-                                    <v>587</v>
+                                    <v>598</v>
                                 </b>
                                 <b>
                                     <a>38</a>
                                     <b>39</b>
-                                    <v>1489</v>
+                                    <v>1518</v>
                                 </b>
                                 <b>
                                     <a>39</a>
                                     <b>40</b>
-                                    <v>975</v>
+                                    <v>994</v>
                                 </b>
                                 <b>
                                     <a>40</a>
                                     <b>42</b>
-                                    <v>1080</v>
+                                    <v>1101</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>53</b>
-                                    <v>597</v>
+                                    <v>609</v>
                                 </b>
                                 <b>
                                     <a>53</a>
                                     <b>54</b>
-                                    <v>702</v>
+                                    <v>716</v>
                                 </b>
                                 <b>
                                     <a>54</a>
                                     <b>63</b>
-                                    <v>891</v>
+                                    <v>908</v>
                                 </b>
                                 <b>
                                     <a>64</a>
                                     <b>67</b>
-                                    <v>398</v>
+                                    <v>406</v>
                                 </b>
                                 <b>
                                     <a>67</a>
                                     <b>68</b>
-                                    <v>1395</v>
+                                    <v>1422</v>
                                 </b>
                                 <b>
                                     <a>68</a>
                                     <b>70</b>
-                                    <v>965</v>
+                                    <v>983</v>
                                 </b>
                                 <b>
                                     <a>70</a>
                                     <b>71</b>
-                                    <v>1395</v>
+                                    <v>1422</v>
                                 </b>
                                 <b>
                                     <a>73</a>
                                     <b>79</b>
-                                    <v>944</v>
+                                    <v>962</v>
                                 </b>
                                 <b>
                                     <a>79</a>
                                     <b>89</b>
-                                    <v>1122</v>
+                                    <v>1144</v>
                                 </b>
                                 <b>
                                     <a>89</a>
@@ -2412,57 +2424,57 @@
                                 <b>
                                     <a>43</a>
                                     <b>90</b>
-                                    <v>62</v>
+                                    <v>64</v>
                                 </b>
                                 <b>
                                     <a>90</a>
                                     <b>108</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>108</a>
                                     <b>183</b>
-                                    <v>104</v>
+                                    <v>106</v>
                                 </b>
                                 <b>
                                     <a>198</a>
                                     <b>422</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>422</a>
                                     <b>595</b>
-                                    <v>125</v>
+                                    <v>128</v>
                                 </b>
                                 <b>
                                     <a>595</a>
                                     <b>605</b>
-                                    <v>125</v>
+                                    <v>128</v>
                                 </b>
                                 <b>
                                     <a>605</a>
                                     <b>749</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>750</a>
                                     <b>778</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>781</a>
                                     <b>883</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>930</a>
                                     <b>1190</b>
-                                    <v>83</v>
+                                    <v>85</v>
                                 </b>
                                 <b>
                                     <a>1197</a>
                                     <b>1198</b>
-                                    <v>377</v>
+                                    <v>384</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2478,72 +2490,72 @@
                                 <b>
                                     <a>1</a>
                                     <b>5</b>
-                                    <v>125</v>
+                                    <v>128</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>12</b>
-                                    <v>73</v>
+                                    <v>74</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>15</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>18</b>
-                                    <v>94</v>
+                                    <v>96</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>22</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>22</a>
                                     <b>27</b>
-                                    <v>125</v>
+                                    <v>128</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>29</b>
-                                    <v>83</v>
+                                    <v>85</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>34</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>34</a>
                                     <b>44</b>
-                                    <v>125</v>
+                                    <v>128</v>
                                 </b>
                                 <b>
                                     <a>45</a>
                                     <b>63</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>67</a>
                                     <b>94</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>94</a>
                                     <b>164</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>171</a>
                                     <b>199</b>
-                                    <v>20</v>
+                                    <v>21</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2559,22 +2571,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13312</v>
+                                    <v>13569</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12598</v>
+                                    <v>12842</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>103</b>
-                                    <v>2181</v>
+                                    <v>2224</v>
                                 </b>
                                 <b>
                                     <a>104</a>
                                     <b>1198</b>
-                                    <v>975</v>
+                                    <v>994</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2590,17 +2602,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19249</v>
+                                    <v>19621</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8664</v>
+                                    <v>8832</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>62</b>
-                                    <v>1153</v>
+                                    <v>1176</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2658,19 +2670,19 @@
         </relation>
         <relation>
             <name>compilation_compiling_files</name>
-            <cardinality>15741</cardinality>
+            <cardinality>15732</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2723</v>
+                    <v>2721</v>
                 </e>
                 <e>
                     <k>num</k>
-                    <v>4520</v>
+                    <v>4518</v>
                 </e>
                 <e>
                     <k>file</k>
-                    <v>13671</v>
+                    <v>13663</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2684,7 +2696,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1361</v>
+                                    <v>1360</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -2735,7 +2747,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1361</v>
+                                    <v>1360</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -2786,17 +2798,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2396</v>
+                                    <v>2395</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>980</v>
+                                    <v>979</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>490</v>
+                                    <v>489</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -2822,17 +2834,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2396</v>
+                                    <v>2395</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>980</v>
+                                    <v>979</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>490</v>
+                                    <v>489</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -2858,7 +2870,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12310</v>
+                                    <v>12302</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -2884,12 +2896,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12527</v>
+                                    <v>12520</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>1089</v>
+                                    <v>1088</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -2904,15 +2916,15 @@
         </relation>
         <relation>
             <name>compilation_time</name>
-            <cardinality>62966</cardinality>
+            <cardinality>62930</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2723</v>
+                    <v>2721</v>
                 </e>
                 <e>
                     <k>num</k>
-                    <v>4520</v>
+                    <v>4518</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -2920,7 +2932,7 @@
                 </e>
                 <e>
                     <k>seconds</k>
-                    <v>18682</v>
+                    <v>22646</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2934,7 +2946,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1361</v>
+                                    <v>1360</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -2985,7 +2997,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>2723</v>
+                                    <v>2721</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2998,56 +3010,56 @@
                         <hist>
                             <budget>12</budget>
                             <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>54</v>
-                                </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>544</v>
+                                    <v>326</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>762</v>
+                                    <v>1034</v>
                                 </b>
                                 <b>
                                     <a>6</a>
-                                    <b>9</b>
-                                    <v>217</v>
+                                    <b>7</b>
+                                    <v>163</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
+                                    <a>8</a>
                                     <b>10</b>
-                                    <v>108</v>
+                                    <v>163</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>163</v>
+                                    <v>108</v>
                                 </b>
                                 <b>
                                     <a>11</a>
-                                    <b>13</b>
+                                    <b>12</b>
                                     <v>217</v>
                                 </b>
                                 <b>
-                                    <a>14</a>
-                                    <b>17</b>
-                                    <v>217</v>
+                                    <a>12</a>
+                                    <b>18</b>
+                                    <v>163</v>
                                 </b>
                                 <b>
-                                    <a>17</a>
-                                    <b>22</b>
+                                    <a>18</a>
+                                    <b>20</b>
                                     <v>217</v>
                                 </b>
                                 <b>
-                                    <a>26</a>
-                                    <b>121</b>
+                                    <a>21</a>
+                                    <b>40</b>
                                     <v>217</v>
                                 </b>
+                                <b>
+                                    <a>60</a>
+                                    <b>152</b>
+                                    <v>108</v>
+                                </b>
                             </bs>
                         </hist>
                     </val>
@@ -3062,17 +3074,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2396</v>
+                                    <v>2395</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>980</v>
+                                    <v>979</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>490</v>
+                                    <v>489</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -3098,7 +3110,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>4520</v>
+                                    <v>4518</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3119,17 +3131,17 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1525</v>
+                                    <v>1469</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>272</v>
+                                    <v>108</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>490</v>
+                                    <v>653</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -3138,18 +3150,18 @@
                                 </b>
                                 <b>
                                     <a>9</a>
-                                    <b>12</b>
+                                    <b>11</b>
                                     <v>381</v>
                                 </b>
                                 <b>
-                                    <a>13</a>
-                                    <b>41</b>
+                                    <a>12</a>
+                                    <b>31</b>
                                     <v>381</v>
                                 </b>
                                 <b>
-                                    <a>44</a>
-                                    <b>100</b>
-                                    <v>163</v>
+                                    <a>42</a>
+                                    <b>98</b>
+                                    <v>217</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3197,16 +3209,21 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>108</v>
+                                    <v>54</v>
                                 </b>
                                 <b>
-                                    <a>189</a>
-                                    <b>190</b>
+                                    <a>5</a>
+                                    <b>6</b>
                                     <v>54</v>
                                 </b>
                                 <b>
-                                    <a>198</a>
-                                    <b>199</b>
+                                    <a>226</a>
+                                    <b>227</b>
+                                    <v>54</v>
+                                </b>
+                                <b>
+                                    <a>230</a>
+                                    <b>231</b>
                                     <v>54</v>
                                 </b>
                             </bs>
@@ -3223,22 +3240,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12854</v>
+                                    <v>17583</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3921</v>
+                                    <v>3701</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>5</b>
-                                    <v>1688</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>42</b>
-                                    <v>217</v>
+                                    <b>46</b>
+                                    <v>1360</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3254,22 +3266,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11765</v>
+                                    <v>16494</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3867</v>
+                                    <v>4191</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>4</b>
-                                    <v>1743</v>
+                                    <b>8</b>
+                                    <v>1742</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>67</b>
-                                    <v>1307</v>
+                                    <a>12</a>
+                                    <b>71</b>
+                                    <v>217</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3285,12 +3297,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15850</v>
+                                    <v>19978</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2832</v>
+                                    <v>2667</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3300,15 +3312,15 @@
         </relation>
         <relation>
             <name>diagnostic_for</name>
-            <cardinality>503</cardinality>
+            <cardinality>513</cardinality>
             <columnsizes>
                 <e>
                     <k>diagnostic</k>
-                    <v>356</v>
+                    <v>363</v>
                 </e>
                 <e>
                     <k>compilation</k>
-                    <v>188</v>
+                    <v>192</v>
                 </e>
                 <e>
                     <k>file_number</k>
@@ -3316,7 +3328,7 @@
                 </e>
                 <e>
                     <k>file_number_diagnostic_number</k>
-                    <v>52</v>
+                    <v>53</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -3330,12 +3342,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>209</v>
+                                    <v>213</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>146</v>
+                                    <v>149</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3351,7 +3363,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>356</v>
+                                    <v>363</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3367,7 +3379,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>356</v>
+                                    <v>363</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3383,17 +3395,17 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>104</v>
+                                    <v>106</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>62</v>
+                                    <v>64</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>20</v>
+                                    <v>21</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3409,7 +3421,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>188</v>
+                                    <v>192</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3425,17 +3437,17 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>104</v>
+                                    <v>106</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>62</v>
+                                    <v>64</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>20</v>
+                                    <v>21</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3499,7 +3511,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20</v>
+                                    <v>21</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -3530,7 +3542,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>20</v>
+                                    <v>21</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -3540,7 +3552,7 @@
                                 <b>
                                     <a>18</a>
                                     <b>19</b>
-                                    <v>20</v>
+                                    <v>21</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3556,7 +3568,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52</v>
+                                    <v>53</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3566,19 +3578,19 @@
         </relation>
         <relation>
             <name>compilation_finished</name>
-            <cardinality>12556</cardinality>
+            <cardinality>12799</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12556</v>
+                    <v>12799</v>
                 </e>
                 <e>
                     <k>cpu_seconds</k>
-                    <v>9420</v>
+                    <v>8843</v>
                 </e>
                 <e>
                     <k>elapsed_seconds</k>
-                    <v>199</v>
+                    <v>149</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -3592,7 +3604,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12556</v>
+                                    <v>12799</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3608,7 +3620,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12556</v>
+                                    <v>12799</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3624,17 +3636,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7930</v>
+                                    <v>7078</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>996</v>
+                                    <v>1186</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>28</b>
-                                    <v>493</v>
+                                    <b>34</b>
+                                    <v>577</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3650,12 +3662,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8843</v>
+                                    <v>8009</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>576</v>
+                                    <v>834</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3671,66 +3683,56 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31</v>
+                                    <v>32</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>31</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>31</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>13</b>
+                                    <a>3</a>
+                                    <b>4</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>14</a>
-                                    <b>15</b>
+                                    <a>4</a>
+                                    <b>5</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>19</b>
-                                    <v>10</v>
+                                    <a>15</a>
+                                    <b>16</b>
+                                    <v>21</v>
                                 </b>
                                 <b>
-                                    <a>32</a>
-                                    <b>33</b>
+                                    <a>24</a>
+                                    <b>25</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>51</a>
-                                    <b>52</b>
+                                    <a>30</a>
+                                    <b>31</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>159</a>
-                                    <b>160</b>
+                                    <a>37</a>
+                                    <b>38</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>260</a>
-                                    <b>261</b>
+                                    <a>235</a>
+                                    <b>236</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>286</a>
-                                    <b>287</b>
+                                    <a>411</a>
+                                    <b>412</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>322</a>
-                                    <b>323</b>
+                                    <a>418</a>
+                                    <b>419</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -3747,66 +3749,56 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31</v>
+                                    <v>32</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>31</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>31</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>13</b>
+                                    <a>3</a>
+                                    <b>4</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>13</a>
-                                    <b>14</b>
+                                    <a>4</a>
+                                    <b>5</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>19</b>
-                                    <v>10</v>
+                                    <a>15</a>
+                                    <b>16</b>
+                                    <v>21</v>
                                 </b>
                                 <b>
-                                    <a>32</a>
-                                    <b>33</b>
+                                    <a>24</a>
+                                    <b>25</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>51</a>
-                                    <b>52</b>
+                                    <a>30</a>
+                                    <b>31</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>134</a>
-                                    <b>135</b>
+                                    <a>37</a>
+                                    <b>38</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>155</a>
-                                    <b>156</b>
+                                    <a>200</a>
+                                    <b>201</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>234</a>
-                                    <b>235</b>
+                                    <a>216</a>
+                                    <b>217</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>261</a>
-                                    <b>262</b>
+                                    <a>356</a>
+                                    <b>357</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -4044,31 +4036,31 @@
         </relation>
         <relation>
             <name>locations_default</name>
-            <cardinality>46362405</cardinality>
+            <cardinality>46369281</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>46362405</v>
+                    <v>46369281</v>
                 </e>
                 <e>
                     <k>file</k>
-                    <v>40263</v>
+                    <v>40272</v>
                 </e>
                 <e>
                     <k>beginLine</k>
-                    <v>7381369</v>
+                    <v>7382992</v>
                 </e>
                 <e>
                     <k>beginColumn</k>
-                    <v>21604</v>
+                    <v>21609</v>
                 </e>
                 <e>
                     <k>endLine</k>
-                    <v>7382351</v>
+                    <v>7383974</v>
                 </e>
                 <e>
                     <k>endColumn</k>
-                    <v>52907</v>
+                    <v>52918</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -4082,7 +4074,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46362405</v>
+                                    <v>46369281</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4098,7 +4090,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46362405</v>
+                                    <v>46369281</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4114,7 +4106,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46362405</v>
+                                    <v>46369281</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4130,7 +4122,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46362405</v>
+                                    <v>46369281</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4146,7 +4138,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46362405</v>
+                                    <v>46369281</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4162,67 +4154,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>15</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>41</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>72</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>72</a>
                                     <b>114</b>
-                                    <v>3191</v>
+                                    <v>3192</v>
                                 </b>
                                 <b>
                                     <a>114</a>
                                     <b>142</b>
-                                    <v>3191</v>
+                                    <v>3192</v>
                                 </b>
                                 <b>
                                     <a>143</a>
                                     <b>212</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>213</a>
                                     <b>307</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>310</a>
                                     <b>435</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>437</a>
                                     <b>596</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>607</a>
                                     <b>846</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>848</a>
                                     <b>1304</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>1354</a>
                                     <b>2855</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>3114</a>
                                     <b>30788</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>57880</a>
@@ -4243,62 +4235,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>13</b>
-                                    <v>3314</v>
+                                    <v>3315</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>31</b>
-                                    <v>3314</v>
+                                    <v>3315</v>
                                 </b>
                                 <b>
                                     <a>31</a>
                                     <b>47</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>47</a>
                                     <b>64</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>64</a>
                                     <b>84</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>85</a>
                                     <b>115</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>116</a>
                                     <b>160</b>
-                                    <v>3191</v>
+                                    <v>3192</v>
                                 </b>
                                 <b>
                                     <a>160</a>
                                     <b>206</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>206</a>
                                     <b>291</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>298</a>
                                     <b>388</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>395</a>
                                     <b>527</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>561</a>
                                     <b>1339</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>1385</a>
@@ -4319,62 +4311,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>5</b>
-                                    <v>3682</v>
+                                    <v>3683</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>9</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>15</b>
-                                    <v>3191</v>
+                                    <v>3192</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>20</b>
-                                    <v>3191</v>
+                                    <v>3192</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>28</b>
-                                    <v>3191</v>
+                                    <v>3192</v>
                                 </b>
                                 <b>
                                     <a>28</a>
                                     <b>36</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>36</a>
                                     <b>43</b>
-                                    <v>3314</v>
+                                    <v>3315</v>
                                 </b>
                                 <b>
                                     <a>43</a>
                                     <b>53</b>
-                                    <v>3191</v>
+                                    <v>3192</v>
                                 </b>
                                 <b>
                                     <a>53</a>
                                     <b>62</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>62</a>
                                     <b>80</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>80</a>
                                     <b>95</b>
-                                    <v>3191</v>
+                                    <v>3192</v>
                                 </b>
                                 <b>
                                     <a>95</a>
                                     <b>111</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>112</a>
@@ -4395,62 +4387,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>13</b>
-                                    <v>3314</v>
+                                    <v>3315</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>31</b>
-                                    <v>3314</v>
+                                    <v>3315</v>
                                 </b>
                                 <b>
                                     <a>31</a>
                                     <b>46</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>46</a>
                                     <b>63</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>63</a>
                                     <b>84</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>84</a>
                                     <b>114</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>118</a>
                                     <b>160</b>
-                                    <v>3191</v>
+                                    <v>3192</v>
                                 </b>
                                 <b>
                                     <a>160</a>
                                     <b>206</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>207</a>
                                     <b>291</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>300</a>
                                     <b>390</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>395</a>
                                     <b>562</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>564</a>
                                     <b>1350</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>1430</a>
@@ -4471,7 +4463,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>12</b>
-                                    <v>3314</v>
+                                    <v>3315</v>
                                 </b>
                                 <b>
                                     <a>13</a>
@@ -4481,27 +4473,27 @@
                                 <b>
                                     <a>26</a>
                                     <b>34</b>
-                                    <v>3191</v>
+                                    <v>3192</v>
                                 </b>
                                 <b>
                                     <a>34</a>
                                     <b>42</b>
-                                    <v>3191</v>
+                                    <v>3192</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>50</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>50</a>
                                     <b>61</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>61</a>
                                     <b>67</b>
-                                    <v>3314</v>
+                                    <v>3315</v>
                                 </b>
                                 <b>
                                     <a>67</a>
@@ -4511,27 +4503,27 @@
                                 <b>
                                     <a>76</a>
                                     <b>88</b>
-                                    <v>3191</v>
+                                    <v>3192</v>
                                 </b>
                                 <b>
                                     <a>89</a>
                                     <b>102</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>102</a>
                                     <b>116</b>
-                                    <v>3314</v>
+                                    <v>3315</v>
                                 </b>
                                 <b>
                                     <a>116</a>
                                     <b>132</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>132</a>
                                     <b>364</b>
-                                    <v>1595</v>
+                                    <v>1596</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4547,32 +4539,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4878521</v>
+                                    <v>4879594</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>768076</v>
+                                    <v>768245</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>535333</v>
+                                    <v>535451</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>558043</v>
+                                    <v>558166</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>97</b>
-                                    <v>555220</v>
+                                    <v>555342</v>
                                 </b>
                                 <b>
                                     <a>97</a>
                                     <b>639</b>
-                                    <v>86173</v>
+                                    <v>86192</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4588,27 +4580,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4939899</v>
+                                    <v>4940984</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1200296</v>
+                                    <v>1200560</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>629609</v>
+                                    <v>629747</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>56</b>
-                                    <v>554851</v>
+                                    <v>554973</v>
                                 </b>
                                 <b>
                                     <a>56</a>
                                     <b>329</b>
-                                    <v>56712</v>
+                                    <v>56725</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4624,27 +4616,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5552936</v>
+                                    <v>5554157</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>476534</v>
+                                    <v>476638</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>568968</v>
+                                    <v>569093</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>25</b>
-                                    <v>556938</v>
+                                    <v>557061</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>94</b>
-                                    <v>225991</v>
+                                    <v>226041</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4660,12 +4652,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6921775</v>
+                                    <v>6923297</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>85</b>
-                                    <v>459594</v>
+                                    <v>459695</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4681,32 +4673,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4946036</v>
+                                    <v>4947124</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>731004</v>
+                                    <v>731165</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>528091</v>
+                                    <v>528207</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>576088</v>
+                                    <v>576214</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>71</b>
-                                    <v>554483</v>
+                                    <v>554605</v>
                                 </b>
                                 <b>
                                     <a>71</a>
                                     <b>252</b>
-                                    <v>45664</v>
+                                    <v>45674</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4903,7 +4895,7 @@
                                 </b>
                                 <b>
                                     <a>226</a>
-                                    <b>548</b>
+                                    <b>547</b>
                                     <v>1718</v>
                                 </b>
                                 <b>
@@ -4979,7 +4971,7 @@
                                 </b>
                                 <b>
                                     <a>225</a>
-                                    <b>550</b>
+                                    <b>549</b>
                                     <v>1718</v>
                                 </b>
                                 <b>
@@ -5026,7 +5018,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2086</v>
+                                    <v>2087</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5036,7 +5028,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>1595</v>
+                                    <v>1596</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -5070,23 +5062,23 @@
                                 </b>
                                 <b>
                                     <a>74</a>
-                                    <b>87</b>
-                                    <v>1964</v>
+                                    <b>85</b>
+                                    <v>1718</v>
                                 </b>
                                 <b>
-                                    <a>87</a>
-                                    <b>99</b>
+                                    <a>85</a>
+                                    <b>97</b>
                                     <v>1718</v>
                                 </b>
                                 <b>
-                                    <a>100</a>
-                                    <b>160</b>
+                                    <a>98</a>
+                                    <b>155</b>
                                     <v>1718</v>
                                 </b>
                                 <b>
-                                    <a>261</a>
+                                    <a>155</a>
                                     <b>299</b>
-                                    <v>245</v>
+                                    <v>491</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5102,32 +5094,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4876312</v>
+                                    <v>4877384</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>771391</v>
+                                    <v>771560</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>534597</v>
+                                    <v>534714</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>556938</v>
+                                    <v>557061</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>94</b>
-                                    <v>553746</v>
+                                    <v>553868</v>
                                 </b>
                                 <b>
                                     <a>94</a>
                                     <b>622</b>
-                                    <v>89365</v>
+                                    <v>89385</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5143,27 +5135,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4936952</v>
+                                    <v>4938038</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1203856</v>
+                                    <v>1204121</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>622121</v>
+                                    <v>622258</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>51</b>
-                                    <v>554728</v>
+                                    <v>554850</v>
                                 </b>
                                 <b>
                                     <a>51</a>
                                     <b>329</b>
-                                    <v>64691</v>
+                                    <v>64706</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5179,12 +5171,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6938592</v>
+                                    <v>6940118</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>15</b>
-                                    <v>443758</v>
+                                    <v>443856</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5200,27 +5192,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5551586</v>
+                                    <v>5552806</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>475061</v>
+                                    <v>475165</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>573019</v>
+                                    <v>573268</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>25</b>
-                                    <v>559761</v>
+                                    <v>559762</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>89</b>
-                                    <v>222922</v>
+                                    <v>222971</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5236,32 +5228,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4944563</v>
+                                    <v>4945650</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>736160</v>
+                                    <v>736322</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>526495</v>
+                                    <v>526611</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>577929</v>
+                                    <v>578056</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>72</b>
-                                    <v>554237</v>
+                                    <v>554359</v>
                                 </b>
                                 <b>
                                     <a>72</a>
                                     <b>252</b>
-                                    <v>42964</v>
+                                    <v>42973</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5277,52 +5269,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15344</v>
+                                    <v>15347</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5646</v>
+                                    <v>5647</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>4173</v>
+                                    <v>4420</v>
                                 </b>
                                 <b>
                                     <a>6</a>
-                                    <b>16</b>
-                                    <v>4050</v>
+                                    <b>17</b>
+                                    <v>4051</v>
                                 </b>
                                 <b>
-                                    <a>16</a>
-                                    <b>31</b>
-                                    <v>4173</v>
+                                    <a>17</a>
+                                    <b>32</b>
+                                    <v>4051</v>
                                 </b>
                                 <b>
-                                    <a>31</a>
-                                    <b>93</b>
-                                    <v>4050</v>
+                                    <a>32</a>
+                                    <b>97</b>
+                                    <v>4051</v>
                                 </b>
                                 <b>
-                                    <a>96</a>
-                                    <b>660</b>
-                                    <v>4050</v>
+                                    <a>107</a>
+                                    <b>663</b>
+                                    <v>4051</v>
                                 </b>
                                 <b>
-                                    <a>662</a>
-                                    <b>2411</b>
-                                    <v>4050</v>
+                                    <a>699</a>
+                                    <b>2462</b>
+                                    <v>4051</v>
                                 </b>
                                 <b>
-                                    <a>2462</a>
-                                    <b>4702</b>
-                                    <v>4050</v>
+                                    <a>2469</a>
+                                    <b>4721</b>
+                                    <v>4051</v>
                                 </b>
                                 <b>
-                                    <a>4720</a>
+                                    <a>4757</a>
                                     <b>33780</b>
-                                    <v>3314</v>
+                                    <v>3192</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5338,47 +5330,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17922</v>
+                                    <v>18048</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6014</v>
+                                    <v>6016</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>3437</v>
+                                    <v>3315</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>4541</v>
+                                    <v>4542</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>17</b>
-                                    <v>4173</v>
+                                    <v>4174</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>84</b>
-                                    <v>4050</v>
+                                    <v>4051</v>
                                 </b>
                                 <b>
                                     <a>88</a>
                                     <b>160</b>
-                                    <v>4173</v>
+                                    <v>4174</v>
                                 </b>
                                 <b>
                                     <a>160</a>
                                     <b>214</b>
-                                    <v>4050</v>
+                                    <v>4051</v>
                                 </b>
                                 <b>
                                     <a>215</a>
                                     <b>267</b>
-                                    <v>4050</v>
+                                    <v>4051</v>
                                 </b>
                                 <b>
                                     <a>267</a>
@@ -5399,50 +5391,50 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15589</v>
+                                    <v>15593</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6014</v>
+                                    <v>6139</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>4173</v>
+                                    <v>4051</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>18</b>
-                                    <v>4419</v>
+                                    <v>4420</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>40</b>
-                                    <v>4173</v>
+                                    <v>4174</v>
                                 </b>
                                 <b>
                                     <a>41</a>
                                     <b>188</b>
-                                    <v>4050</v>
+                                    <v>4051</v>
                                 </b>
                                 <b>
                                     <a>217</a>
                                     <b>747</b>
-                                    <v>4050</v>
+                                    <v>4051</v>
                                 </b>
                                 <b>
-                                    <a>766</a>
+                                    <a>765</a>
                                     <b>2171</b>
-                                    <v>4050</v>
+                                    <v>4051</v>
                                 </b>
                                 <b>
                                     <a>2171</a>
                                     <b>2881</b>
-                                    <v>4050</v>
+                                    <v>4051</v>
                                 </b>
                                 <b>
-                                    <a>2891</a>
+                                    <a>2892</a>
                                     <b>30763</b>
                                     <v>2332</v>
                                 </b>
@@ -5460,47 +5452,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16571</v>
+                                    <v>16575</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6628</v>
+                                    <v>6630</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>4787</v>
+                                    <v>4788</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>9</b>
-                                    <v>4296</v>
+                                    <v>4297</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>20</b>
-                                    <v>4173</v>
+                                    <v>4174</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>32</b>
-                                    <v>4296</v>
+                                    <v>4297</v>
                                 </b>
                                 <b>
                                     <a>33</a>
                                     <b>57</b>
-                                    <v>4050</v>
+                                    <v>4051</v>
                                 </b>
                                 <b>
                                     <a>57</a>
                                     <b>76</b>
-                                    <v>4296</v>
+                                    <v>4297</v>
                                 </b>
                                 <b>
                                     <a>76</a>
                                     <b>117</b>
-                                    <v>3805</v>
+                                    <v>3806</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5516,47 +5508,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15589</v>
+                                    <v>15593</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6014</v>
+                                    <v>6139</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>4173</v>
+                                    <v>4051</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>17</b>
-                                    <v>4050</v>
+                                    <v>4051</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>30</b>
-                                    <v>4050</v>
+                                    <v>4051</v>
                                 </b>
                                 <b>
                                     <a>32</a>
                                     <b>102</b>
-                                    <v>4050</v>
+                                    <v>4051</v>
                                 </b>
                                 <b>
                                     <a>104</a>
                                     <b>621</b>
-                                    <v>4050</v>
+                                    <v>4051</v>
                                 </b>
                                 <b>
                                     <a>628</a>
                                     <b>1958</b>
-                                    <v>4050</v>
+                                    <v>4051</v>
                                 </b>
                                 <b>
-                                    <a>1967</a>
+                                    <a>1966</a>
                                     <b>2836</b>
-                                    <v>4050</v>
+                                    <v>4051</v>
                                 </b>
                                 <b>
                                     <a>2841</a>
@@ -5571,15 +5563,15 @@
         </relation>
         <relation>
             <name>files</name>
-            <cardinality>64766</cardinality>
+            <cardinality>66019</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>64766</v>
+                    <v>66019</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>64766</v>
+                    <v>66019</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5593,7 +5585,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>64766</v>
+                                    <v>66019</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5609,7 +5601,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>64766</v>
+                                    <v>66019</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5619,15 +5611,15 @@
         </relation>
         <relation>
             <name>folders</name>
-            <cardinality>12305</cardinality>
+            <cardinality>12543</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12305</v>
+                    <v>12543</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>12305</v>
+                    <v>12543</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5641,7 +5633,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12305</v>
+                                    <v>12543</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5657,7 +5649,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12305</v>
+                                    <v>12543</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5667,15 +5659,15 @@
         </relation>
         <relation>
             <name>containerparent</name>
-            <cardinality>77050</cardinality>
+            <cardinality>78540</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>12305</v>
+                    <v>12543</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>77050</v>
+                    <v>78540</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5689,42 +5681,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5989</v>
+                                    <v>6105</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1510</v>
+                                    <v>1539</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>660</v>
+                                    <v>673</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>996</v>
+                                    <v>1015</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>965</v>
+                                    <v>983</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>16</b>
-                                    <v>996</v>
+                                    <v>1015</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>44</b>
-                                    <v>923</v>
+                                    <v>940</v>
                                 </b>
                                 <b>
                                     <a>44</a>
                                     <b>151</b>
-                                    <v>262</v>
+                                    <v>267</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5740,7 +5732,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>77050</v>
+                                    <v>78540</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5750,23 +5742,23 @@
         </relation>
         <relation>
             <name>numlines</name>
-            <cardinality>794223</cardinality>
+            <cardinality>794398</cardinality>
             <columnsizes>
                 <e>
                     <k>element_id</k>
-                    <v>793118</v>
+                    <v>793293</v>
                 </e>
                 <e>
                     <k>num_lines</k>
-                    <v>38790</v>
+                    <v>38799</v>
                 </e>
                 <e>
                     <k>num_code</k>
-                    <v>33512</v>
+                    <v>33519</v>
                 </e>
                 <e>
                     <k>num_comment</k>
-                    <v>18044</v>
+                    <v>18048</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5780,12 +5772,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>792014</v>
+                                    <v>792188</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1104</v>
+                                    <v>1105</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5801,12 +5793,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>792014</v>
+                                    <v>792188</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1104</v>
+                                    <v>1105</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5822,7 +5814,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>792873</v>
+                                    <v>793047</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5843,17 +5835,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26269</v>
+                                    <v>26275</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3682</v>
+                                    <v>3683</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>3314</v>
+                                    <v>3315</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -5863,7 +5855,7 @@
                                 <b>
                                     <a>39</a>
                                     <b>1981</b>
-                                    <v>2577</v>
+                                    <v>2578</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5879,12 +5871,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26760</v>
+                                    <v>26766</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4050</v>
+                                    <v>4051</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -5899,7 +5891,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>12</b>
-                                    <v>2086</v>
+                                    <v>2087</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5915,12 +5907,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26392</v>
+                                    <v>26398</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4050</v>
+                                    <v>4051</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -5930,7 +5922,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>3191</v>
+                                    <v>3192</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -5951,12 +5943,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21482</v>
+                                    <v>21486</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3559</v>
+                                    <v>3560</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -5966,12 +5958,12 @@
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>2577</v>
+                                    <v>2578</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>157</b>
-                                    <v>2577</v>
+                                    <v>2578</v>
                                 </b>
                                 <b>
                                     <a>172</a>
@@ -5992,17 +5984,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21850</v>
+                                    <v>21855</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3559</v>
+                                    <v>3560</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2086</v>
+                                    <v>2087</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -6012,7 +6004,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>2700</v>
+                                    <v>2701</v>
                                 </b>
                                 <b>
                                     <a>9</a>
@@ -6033,12 +6025,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21604</v>
+                                    <v>21609</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4173</v>
+                                    <v>4174</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -6048,7 +6040,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -6069,7 +6061,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11170</v>
+                                    <v>11173</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -6079,7 +6071,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1104</v>
+                                    <v>1105</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -6110,7 +6102,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11170</v>
+                                    <v>11173</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -6120,12 +6112,12 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1104</v>
+                                    <v>1105</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>1595</v>
+                                    <v>1596</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -6151,7 +6143,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11170</v>
+                                    <v>11173</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -6186,31 +6178,31 @@
         </relation>
         <relation>
             <name>diagnostics</name>
-            <cardinality>356</cardinality>
+            <cardinality>363</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>356</v>
+                    <v>363</v>
                 </e>
                 <e>
                     <k>severity</k>
-                    <v>20</v>
+                    <v>21</v>
                 </e>
                 <e>
                     <k>error_tag</k>
-                    <v>73</v>
+                    <v>74</v>
                 </e>
                 <e>
                     <k>error_message</k>
-                    <v>146</v>
+                    <v>149</v>
                 </e>
                 <e>
                     <k>full_error_message</k>
-                    <v>178</v>
+                    <v>181</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>178</v>
+                    <v>181</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -6224,7 +6216,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>356</v>
+                                    <v>363</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6240,7 +6232,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>356</v>
+                                    <v>363</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6256,7 +6248,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>356</v>
+                                    <v>363</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6272,7 +6264,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>356</v>
+                                    <v>363</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6288,7 +6280,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>356</v>
+                                    <v>363</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6409,7 +6401,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>41</v>
+                                    <v>42</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -6440,7 +6432,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73</v>
+                                    <v>74</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6456,7 +6448,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52</v>
+                                    <v>53</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -6482,7 +6474,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52</v>
+                                    <v>53</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -6508,7 +6500,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52</v>
+                                    <v>53</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -6534,12 +6526,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>104</v>
+                                    <v>106</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>31</v>
+                                    <v>32</v>
                                 </b>
                                 <b>
                                     <a>18</a>
@@ -6560,7 +6552,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>146</v>
+                                    <v>149</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6576,7 +6568,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>146</v>
+                                    <v>149</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6592,12 +6584,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>31</v>
+                                    <v>32</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6613,12 +6605,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>31</v>
+                                    <v>32</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6634,7 +6626,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>167</v>
+                                    <v>171</v>
                                 </b>
                                 <b>
                                     <a>18</a>
@@ -6655,7 +6647,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>178</v>
+                                    <v>181</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6671,7 +6663,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>178</v>
+                                    <v>181</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6687,7 +6679,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>178</v>
+                                    <v>181</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6703,7 +6695,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>178</v>
+                                    <v>181</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6719,7 +6711,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>167</v>
+                                    <v>171</v>
                                 </b>
                                 <b>
                                     <a>18</a>
@@ -6740,7 +6732,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>178</v>
+                                    <v>181</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6756,7 +6748,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>178</v>
+                                    <v>181</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6772,7 +6764,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>178</v>
+                                    <v>181</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6788,7 +6780,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>178</v>
+                                    <v>181</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7134,7 +7126,7 @@
         </relation>
         <relation>
             <name>pch_uses</name>
-            <cardinality>4118</cardinality>
+            <cardinality>4130</cardinality>
             <columnsizes>
                 <e>
                     <k>pch</k>
@@ -7142,11 +7134,11 @@
                 </e>
                 <e>
                     <k>compilation</k>
-                    <v>4118</v>
+                    <v>4130</v>
                 </e>
                 <e>
                     <k>id</k>
-                    <v>4118</v>
+                    <v>4130</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7342,7 +7334,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4118</v>
+                                    <v>4130</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7358,7 +7350,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4118</v>
+                                    <v>4130</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7374,7 +7366,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4118</v>
+                                    <v>4130</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7390,7 +7382,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4118</v>
+                                    <v>4130</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7516,23 +7508,23 @@
         </relation>
         <relation>
             <name>fileannotations</name>
-            <cardinality>4171827</cardinality>
+            <cardinality>4252500</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5727</v>
+                    <v>5838</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>20</v>
+                    <v>21</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>58315</v>
+                    <v>59443</v>
                 </e>
                 <e>
                     <k>value</k>
-                    <v>39244</v>
+                    <v>40002</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7546,12 +7538,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>199</v>
+                                    <v>203</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5528</v>
+                                    <v>5635</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7567,62 +7559,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>86</b>
-                                    <v>430</v>
+                                    <v>438</v>
                                 </b>
                                 <b>
                                     <a>88</a>
                                     <b>206</b>
-                                    <v>430</v>
+                                    <v>438</v>
                                 </b>
                                 <b>
                                     <a>212</a>
                                     <b>291</b>
-                                    <v>440</v>
+                                    <v>449</v>
                                 </b>
                                 <b>
                                     <a>291</a>
                                     <b>359</b>
-                                    <v>430</v>
+                                    <v>438</v>
                                 </b>
                                 <b>
                                     <a>362</a>
                                     <b>401</b>
-                                    <v>430</v>
+                                    <v>438</v>
                                 </b>
                                 <b>
                                     <a>402</a>
                                     <b>479</b>
-                                    <v>430</v>
+                                    <v>438</v>
                                 </b>
                                 <b>
                                     <a>480</a>
                                     <b>549</b>
-                                    <v>251</v>
+                                    <v>256</v>
                                 </b>
                                 <b>
                                     <a>550</a>
                                     <b>551</b>
-                                    <v>1321</v>
+                                    <v>1347</v>
                                 </b>
                                 <b>
                                     <a>553</a>
                                     <b>628</b>
-                                    <v>430</v>
+                                    <v>438</v>
                                 </b>
                                 <b>
                                     <a>631</a>
                                     <b>753</b>
-                                    <v>451</v>
+                                    <v>459</v>
                                 </b>
                                 <b>
                                     <a>753</a>
                                     <b>1231</b>
-                                    <v>440</v>
+                                    <v>449</v>
                                 </b>
                                 <b>
                                     <a>1234</a>
                                     <b>2155</b>
-                                    <v>241</v>
+                                    <v>245</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7638,67 +7630,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>98</b>
-                                    <v>430</v>
+                                    <v>438</v>
                                 </b>
                                 <b>
                                     <a>102</a>
                                     <b>244</b>
-                                    <v>430</v>
+                                    <v>438</v>
                                 </b>
                                 <b>
                                     <a>244</a>
                                     <b>351</b>
-                                    <v>430</v>
+                                    <v>438</v>
                                 </b>
                                 <b>
                                     <a>352</a>
                                     <b>434</b>
-                                    <v>440</v>
+                                    <v>449</v>
                                 </b>
                                 <b>
                                     <a>434</a>
                                     <b>490</b>
-                                    <v>440</v>
+                                    <v>449</v>
                                 </b>
                                 <b>
                                     <a>490</a>
                                     <b>628</b>
-                                    <v>430</v>
+                                    <v>438</v>
                                 </b>
                                 <b>
                                     <a>632</a>
                                     <b>702</b>
-                                    <v>62</v>
+                                    <v>64</v>
                                 </b>
                                 <b>
                                     <a>706</a>
                                     <b>707</b>
-                                    <v>1321</v>
+                                    <v>1347</v>
                                 </b>
                                 <b>
                                     <a>710</a>
                                     <b>939</b>
-                                    <v>430</v>
+                                    <v>438</v>
                                 </b>
                                 <b>
                                     <a>939</a>
                                     <b>1038</b>
-                                    <v>430</v>
+                                    <v>438</v>
                                 </b>
                                 <b>
                                     <a>1066</a>
                                     <b>1853</b>
-                                    <v>430</v>
+                                    <v>438</v>
                                 </b>
                                 <b>
                                     <a>1853</a>
                                     <b>3292</b>
-                                    <v>430</v>
+                                    <v>438</v>
                                 </b>
                                 <b>
                                     <a>3423</a>
                                     <b>3742</b>
-                                    <v>20</v>
+                                    <v>21</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7777,62 +7769,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10951</v>
+                                    <v>11163</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4332</v>
+                                    <v>4416</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>5024</v>
+                                    <v>5122</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>4070</v>
+                                    <v>4148</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>4563</v>
+                                    <v>4651</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>16</b>
-                                    <v>4301</v>
+                                    <v>4384</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>19</b>
-                                    <v>4856</v>
+                                    <v>4950</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>27</b>
-                                    <v>4227</v>
+                                    <v>4309</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>47</b>
-                                    <v>4804</v>
+                                    <v>4897</v>
                                 </b>
                                 <b>
                                     <a>47</a>
                                     <b>128</b>
-                                    <v>4888</v>
+                                    <v>4982</v>
                                 </b>
                                 <b>
                                     <a>128</a>
                                     <b>459</b>
-                                    <v>4594</v>
+                                    <v>4683</v>
                                 </b>
                                 <b>
                                     <a>459</a>
                                     <b>546</b>
-                                    <v>1699</v>
+                                    <v>1732</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7848,7 +7840,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>58315</v>
+                                    <v>59443</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7864,57 +7856,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11507</v>
+                                    <v>11730</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7636</v>
+                                    <v>7784</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4070</v>
+                                    <v>4148</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>4038</v>
+                                    <v>4116</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>3398</v>
+                                    <v>3464</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>4710</v>
+                                    <v>4801</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>17</b>
-                                    <v>5360</v>
+                                    <v>5464</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>23</b>
-                                    <v>4668</v>
+                                    <v>4758</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>41</b>
-                                    <v>4647</v>
+                                    <v>4737</v>
                                 </b>
                                 <b>
                                     <a>41</a>
                                     <b>95</b>
-                                    <v>4437</v>
+                                    <v>4523</v>
                                 </b>
                                 <b>
                                     <a>95</a>
                                     <b>1726</b>
-                                    <v>3839</v>
+                                    <v>3913</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7930,72 +7922,72 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3335</v>
+                                    <v>3400</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>1625</v>
+                                    <v>1657</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>3168</v>
+                                    <v>3229</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>2444</v>
+                                    <v>2491</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>14</b>
-                                    <v>2947</v>
+                                    <v>3004</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>17</b>
-                                    <v>1919</v>
+                                    <v>1956</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>24</b>
-                                    <v>3021</v>
+                                    <v>3079</v>
                                 </b>
                                 <b>
                                     <a>24</a>
                                     <b>51</b>
-                                    <v>3514</v>
+                                    <v>3582</v>
                                 </b>
                                 <b>
                                     <a>51</a>
                                     <b>58</b>
-                                    <v>3010</v>
+                                    <v>3068</v>
                                 </b>
                                 <b>
                                     <a>58</a>
                                     <b>80</b>
-                                    <v>2958</v>
+                                    <v>3015</v>
                                 </b>
                                 <b>
                                     <a>81</a>
                                     <b>151</b>
-                                    <v>3063</v>
+                                    <v>3122</v>
                                 </b>
                                 <b>
                                     <a>151</a>
                                     <b>334</b>
-                                    <v>2958</v>
+                                    <v>3015</v>
                                 </b>
                                 <b>
                                     <a>334</a>
                                     <b>473</b>
-                                    <v>2979</v>
+                                    <v>3036</v>
                                 </b>
                                 <b>
                                     <a>473</a>
                                     <b>547</b>
-                                    <v>2297</v>
+                                    <v>2341</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8011,7 +8003,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39233</v>
+                                    <v>39992</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -8032,72 +8024,72 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3377</v>
+                                    <v>3443</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>1898</v>
+                                    <v>1935</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>3031</v>
+                                    <v>3090</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>2465</v>
+                                    <v>2512</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>14</b>
-                                    <v>3461</v>
+                                    <v>3528</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>18</b>
-                                    <v>3430</v>
+                                    <v>3496</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>28</b>
-                                    <v>3178</v>
+                                    <v>3240</v>
                                 </b>
                                 <b>
                                     <a>28</a>
                                     <b>34</b>
-                                    <v>3126</v>
+                                    <v>3186</v>
                                 </b>
                                 <b>
                                     <a>34</a>
                                     <b>41</b>
-                                    <v>3178</v>
+                                    <v>3240</v>
                                 </b>
                                 <b>
                                     <a>41</a>
                                     <b>66</b>
-                                    <v>2968</v>
+                                    <v>3026</v>
                                 </b>
                                 <b>
                                     <a>66</a>
                                     <b>92</b>
-                                    <v>3052</v>
+                                    <v>3111</v>
                                 </b>
                                 <b>
                                     <a>92</a>
                                     <b>113</b>
-                                    <v>2968</v>
+                                    <v>3026</v>
                                 </b>
                                 <b>
                                     <a>113</a>
                                     <b>145</b>
-                                    <v>3010</v>
+                                    <v>3068</v>
                                 </b>
                                 <b>
                                     <a>145</a>
                                     <b>172</b>
-                                    <v>94</v>
+                                    <v>96</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8107,15 +8099,15 @@
         </relation>
         <relation>
             <name>inmacroexpansion</name>
-            <cardinality>150039073</cardinality>
+            <cardinality>149973979</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>24678024</v>
+                    <v>24663860</v>
                 </e>
                 <e>
                     <k>inv</k>
-                    <v>3706403</v>
+                    <v>3704596</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8129,37 +8121,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>3</b>
-                                    <v>2210101</v>
+                                    <v>2207729</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>1475401</v>
+                                    <v>1468685</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>1620834</v>
+                                    <v>1626701</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>6584434</v>
+                                    <v>6580830</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>8721502</v>
+                                    <v>8716496</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>3558069</v>
+                                    <v>3556027</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>22</b>
-                                    <v>507680</v>
+                                    <v>507389</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8175,57 +8167,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>531859</v>
+                                    <v>529077</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>743444</v>
+                                    <v>740947</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>481650</v>
+                                    <v>480815</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>275382</v>
+                                    <v>280651</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>282234</v>
+                                    <v>282072</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>330341</v>
+                                    <v>330155</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>3047</v>
+                                    <v>3041</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>444778</v>
+                                    <v>444522</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>337</b>
-                                    <v>307886</v>
+                                    <v>307708</v>
                                 </b>
                                 <b>
                                     <a>339</a>
                                     <b>423</b>
-                                    <v>281836</v>
+                                    <v>281674</v>
                                 </b>
                                 <b>
                                     <a>423</a>
                                     <b>7616</b>
-                                    <v>23941</v>
+                                    <v>23928</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8235,15 +8227,15 @@
         </relation>
         <relation>
             <name>affectedbymacroexpansion</name>
-            <cardinality>48749819</cardinality>
+            <cardinality>48637828</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7046758</v>
+                    <v>7021712</v>
                 </e>
                 <e>
                     <k>inv</k>
-                    <v>3804211</v>
+                    <v>3802035</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8257,37 +8249,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3847809</v>
+                                    <v>3845602</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>766524</v>
+                                    <v>766084</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>361945</v>
+                                    <v>361737</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>772958</v>
+                                    <v>751511</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>12</b>
-                                    <v>535313</v>
+                                    <v>535006</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>50</b>
-                                    <v>556427</v>
+                                    <v>556107</v>
                                 </b>
                                 <b>
                                     <a>50</a>
                                     <b>9900</b>
-                                    <v>205778</v>
+                                    <v>205660</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8303,67 +8295,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>4</b>
-                                    <v>313336</v>
+                                    <v>313742</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>316698</v>
+                                    <v>319104</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>301174</v>
+                                    <v>300107</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>12</b>
-                                    <v>343037</v>
+                                    <v>342542</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>13</b>
-                                    <v>456135</v>
+                                    <v>460448</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>226164</v>
+                                    <v>224633</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>15</b>
-                                    <v>408155</v>
+                                    <v>409403</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>16</b>
-                                    <v>166476</v>
+                                    <v>165317</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>17</b>
-                                    <v>377786</v>
+                                    <v>377187</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>18</b>
-                                    <v>200694</v>
+                                    <v>202389</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>20</b>
-                                    <v>344354</v>
+                                    <v>342019</v>
                                 </b>
                                 <b>
                                     <a>20</a>
-                                    <b>25</b>
-                                    <v>285475</v>
+                                    <b>26</b>
+                                    <v>297274</v>
                                 </b>
                                 <b>
-                                    <a>25</a>
+                                    <a>26</a>
                                     <b>207</b>
-                                    <v>64720</v>
+                                    <v>47865</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8373,19 +8365,19 @@
         </relation>
         <relation>
             <name>macroinvocations</name>
-            <cardinality>40397045</cardinality>
+            <cardinality>40373865</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>40397045</v>
+                    <v>40373865</v>
                 </e>
                 <e>
                     <k>macro_id</k>
-                    <v>182471</v>
+                    <v>182367</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5926523</v>
+                    <v>5923123</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -8403,7 +8395,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40397045</v>
+                                    <v>40373865</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8419,7 +8411,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40397045</v>
+                                    <v>40373865</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8435,7 +8427,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40397045</v>
+                                    <v>40373865</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8451,47 +8443,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>61114</v>
+                                    <v>61079</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>27615</v>
+                                    <v>27600</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>18083</v>
+                                    <v>18073</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>10022</v>
+                                    <v>10016</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>13835</v>
+                                    <v>13827</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>13</b>
-                                    <v>14597</v>
+                                    <v>14589</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>33</b>
-                                    <v>13726</v>
+                                    <v>13718</v>
                                 </b>
                                 <b>
                                     <a>33</a>
                                     <b>187</b>
-                                    <v>13726</v>
+                                    <v>13718</v>
                                 </b>
                                 <b>
                                     <a>190</a>
                                     <b>72214</b>
-                                    <v>9749</v>
+                                    <v>9744</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8507,42 +8499,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>77673</v>
+                                    <v>77628</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>30666</v>
+                                    <v>30648</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>14379</v>
+                                    <v>14371</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>10294</v>
+                                    <v>10288</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>14053</v>
+                                    <v>14044</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>18</b>
-                                    <v>14107</v>
+                                    <v>14099</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>90</b>
-                                    <v>13726</v>
+                                    <v>13718</v>
                                 </b>
                                 <b>
                                     <a>90</a>
                                     <b>12207</b>
-                                    <v>7571</v>
+                                    <v>7566</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8558,12 +8550,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>177950</v>
+                                    <v>177848</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4520</v>
+                                    <v>4518</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8579,17 +8571,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5262380</v>
+                                    <v>5259361</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>429653</v>
+                                    <v>429406</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>72214</b>
-                                    <v>234490</v>
+                                    <v>234355</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8605,12 +8597,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5904354</v>
+                                    <v>5900967</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>37</b>
-                                    <v>22168</v>
+                                    <v>22156</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8626,7 +8618,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5926523</v>
+                                    <v>5923123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8699,15 +8691,15 @@
         </relation>
         <relation>
             <name>macroparent</name>
-            <cardinality>33692864</cardinality>
+            <cardinality>33673531</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>33692864</v>
+                    <v>33673531</v>
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>15944993</v>
+                    <v>15935844</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8721,7 +8713,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33692864</v>
+                                    <v>33673531</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8737,27 +8729,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7816769</v>
+                                    <v>7812284</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1596166</v>
+                                    <v>1595250</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4708483</v>
+                                    <v>4705781</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1297402</v>
+                                    <v>1296657</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>205</b>
-                                    <v>526172</v>
+                                    <v>525870</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8767,15 +8759,15 @@
         </relation>
         <relation>
             <name>macrolocationbind</name>
-            <cardinality>6005206</cardinality>
+            <cardinality>6014601</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4196566</v>
+                    <v>4204073</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2266167</v>
+                    <v>2268452</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8789,27 +8781,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3275759</v>
+                                    <v>3282337</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>487614</v>
+                                    <v>488105</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>8639</v>
+                                    <v>8647</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>411573</v>
+                                    <v>411988</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>17</b>
-                                    <v>12979</v>
+                                    <v>12993</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8825,27 +8817,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1328980</v>
+                                    <v>1330299</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>479787</v>
+                                    <v>480271</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>7805</v>
+                                    <v>7812</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>425601</v>
+                                    <v>426051</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>522</b>
-                                    <v>23992</v>
+                                    <v>24016</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8855,19 +8847,19 @@
         </relation>
         <relation>
             <name>macro_argument_unexpanded</name>
-            <cardinality>81936815</cardinality>
+            <cardinality>83523288</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>26104126</v>
+                    <v>26610301</v>
                 </e>
                 <e>
                     <k>argument_index</k>
-                    <v>692</v>
+                    <v>705</v>
                 </e>
                 <e>
                     <k>text</k>
-                    <v>340922</v>
+                    <v>347515</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8881,22 +8873,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9611464</v>
+                                    <v>9798055</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9706317</v>
+                                    <v>9894700</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4968887</v>
+                                    <v>5064942</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1817457</v>
+                                    <v>1852603</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8912,22 +8904,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9792851</v>
+                                    <v>9982950</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9723783</v>
+                                    <v>9912504</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4813253</v>
+                                    <v>4906299</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1774237</v>
+                                    <v>1808547</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8943,17 +8935,17 @@
                                 <b>
                                     <a>46457</a>
                                     <b>46458</b>
-                                    <v>608</v>
+                                    <v>620</v>
                                 </b>
                                 <b>
                                     <a>46659</a>
                                     <b>173253</b>
-                                    <v>52</v>
+                                    <v>53</v>
                                 </b>
                                 <b>
-                                    <a>646919</a>
-                                    <b>2488418</b>
-                                    <v>31</v>
+                                    <a>646916</a>
+                                    <b>2488547</b>
+                                    <v>32</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8969,17 +8961,17 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>608</v>
+                                    <v>620</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>1115</b>
-                                    <v>52</v>
+                                    <v>53</v>
                                 </b>
                                 <b>
                                     <a>7702</a>
                                     <b>22873</b>
-                                    <v>31</v>
+                                    <v>32</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8995,57 +8987,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39432</v>
+                                    <v>40195</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>61882</v>
+                                    <v>63078</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>20844</v>
+                                    <v>21247</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>34449</v>
+                                    <v>35126</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>38992</v>
+                                    <v>39746</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>30600</v>
+                                    <v>31191</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>15</b>
-                                    <v>28774</v>
+                                    <v>29331</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>26</b>
-                                    <v>25711</v>
+                                    <v>26198</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>57</b>
-                                    <v>26959</v>
+                                    <v>27481</v>
                                 </b>
                                 <b>
                                     <a>57</a>
                                     <b>517</b>
-                                    <v>25837</v>
+                                    <v>26337</v>
                                 </b>
                                 <b>
                                     <a>518</a>
                                     <b>486640</b>
-                                    <v>7437</v>
+                                    <v>7581</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9061,17 +9053,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241517</v>
+                                    <v>246187</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>89261</v>
+                                    <v>90987</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>10144</v>
+                                    <v>10340</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9081,19 +9073,19 @@
         </relation>
         <relation>
             <name>macro_argument_expanded</name>
-            <cardinality>81936815</cardinality>
+            <cardinality>83523288</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>26104126</v>
+                    <v>26610301</v>
                 </e>
                 <e>
                     <k>argument_index</k>
-                    <v>692</v>
+                    <v>705</v>
                 </e>
                 <e>
                     <k>text</k>
-                    <v>206479</v>
+                    <v>210472</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9107,22 +9099,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9611464</v>
+                                    <v>9798055</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9706317</v>
+                                    <v>9894700</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4968887</v>
+                                    <v>5064942</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1817457</v>
+                                    <v>1852603</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9138,22 +9130,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12550907</v>
+                                    <v>12794618</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8372817</v>
+                                    <v>8535135</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4196783</v>
+                                    <v>4277907</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>983618</v>
+                                    <v>1002639</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9169,17 +9161,17 @@
                                 <b>
                                     <a>46457</a>
                                     <b>46458</b>
-                                    <v>608</v>
+                                    <v>620</v>
                                 </b>
                                 <b>
                                     <a>46659</a>
                                     <b>173253</b>
-                                    <v>52</v>
+                                    <v>53</v>
                                 </b>
                                 <b>
-                                    <a>646919</a>
-                                    <b>2488418</b>
-                                    <v>31</v>
+                                    <a>646916</a>
+                                    <b>2488547</b>
+                                    <v>32</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9195,17 +9187,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>597</v>
+                                    <v>609</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>96</b>
-                                    <v>52</v>
+                                    <v>53</v>
                                 </b>
                                 <b>
                                     <a>950</a>
                                     <b>16173</b>
-                                    <v>41</v>
+                                    <v>42</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9221,57 +9213,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21683</v>
+                                    <v>22102</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>26634</v>
+                                    <v>27139</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>43167</v>
+                                    <v>44012</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>15924</v>
+                                    <v>16253</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>3251</v>
+                                    <v>3314</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>18169</v>
+                                    <v>18520</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>10</b>
-                                    <v>18830</v>
+                                    <v>19194</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>19</b>
-                                    <v>18211</v>
+                                    <v>18541</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>51</b>
-                                    <v>15661</v>
+                                    <v>15964</v>
                                 </b>
                                 <b>
                                     <a>51</a>
                                     <b>251</b>
-                                    <v>15494</v>
+                                    <v>15793</v>
                                 </b>
                                 <b>
                                     <a>251</a>
-                                    <b>1169168</b>
-                                    <v>9451</v>
+                                    <b>1169187</b>
+                                    <v>9634</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9287,17 +9279,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>104336</v>
+                                    <v>106353</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>88306</v>
+                                    <v>90014</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>66</b>
-                                    <v>13836</v>
+                                    <v>14104</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9307,15 +9299,15 @@
         </relation>
         <relation>
             <name>functions</name>
-            <cardinality>3994932</cardinality>
+            <cardinality>3995810</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3994932</v>
+                    <v>3995810</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1666273</v>
+                    <v>1666640</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -9333,7 +9325,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3994932</v>
+                                    <v>3995810</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9349,7 +9341,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3994932</v>
+                                    <v>3995810</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9365,17 +9357,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1421746</v>
+                                    <v>1422058</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>138467</v>
+                                    <v>138497</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>3162</b>
-                                    <v>106060</v>
+                                    <v>106083</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9391,7 +9383,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1663450</v>
+                                    <v>1663816</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -9498,26 +9490,26 @@
         </relation>
         <relation>
             <name>builtin_functions</name>
-            <cardinality>30715</cardinality>
+            <cardinality>31213</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>30715</v>
+                    <v>31213</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_entry_point</name>
-            <cardinality>1124932</cardinality>
+            <cardinality>1131527</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1121608</v>
+                    <v>1128150</v>
                 </e>
                 <e>
                     <k>entry_point</k>
-                    <v>1124932</v>
+                    <v>1131527</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9531,12 +9523,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1118822</v>
+                                    <v>1125314</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>17</b>
-                                    <v>2786</v>
+                                    <v>2836</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9552,7 +9544,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1124932</v>
+                                    <v>1131527</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9562,15 +9554,15 @@
         </relation>
         <relation>
             <name>function_return_type</name>
-            <cardinality>4011995</cardinality>
+            <cardinality>4012877</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3994932</v>
+                    <v>3995810</v>
                 </e>
                 <e>
                     <k>return_type</k>
-                    <v>610950</v>
+                    <v>611084</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9584,12 +9576,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3977869</v>
+                                    <v>3978744</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>17062</v>
+                                    <v>17066</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9605,22 +9597,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>304800</v>
+                                    <v>304867</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>211874</v>
+                                    <v>211921</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>47506</v>
+                                    <v>47516</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>464</b>
-                                    <v>45910</v>
+                                    <v>45920</v>
                                 </b>
                                 <b>
                                     <a>475</a>
@@ -9905,59 +9897,59 @@
         </relation>
         <relation>
             <name>purefunctions</name>
-            <cardinality>130740</cardinality>
+            <cardinality>131114</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>130740</v>
+                    <v>131114</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_deleted</name>
-            <cardinality>87523</cardinality>
+            <cardinality>87628</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>87523</v>
+                    <v>87628</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_defaulted</name>
-            <cardinality>51363</cardinality>
+            <cardinality>51425</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>51363</v>
+                    <v>51425</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_prototyped</name>
-            <cardinality>3993459</cardinality>
+            <cardinality>3994337</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3993459</v>
+                    <v>3994337</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>deduction_guide_for_class</name>
-            <cardinality>5769</cardinality>
+            <cardinality>5770</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5769</v>
+                    <v>5770</v>
                 </e>
                 <e>
                     <k>class_template</k>
-                    <v>2209</v>
+                    <v>2210</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9971,7 +9963,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5769</v>
+                                    <v>5770</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9987,7 +9979,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1104</v>
+                                    <v>1105</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10022,15 +10014,15 @@
         </relation>
         <relation>
             <name>member_function_this_type</name>
-            <cardinality>662507</cardinality>
+            <cardinality>670714</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>662507</v>
+                    <v>670714</v>
                 </e>
                 <e>
                     <k>this_type</k>
-                    <v>173084</v>
+                    <v>227880</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10044,7 +10036,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>662507</v>
+                                    <v>670714</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10060,37 +10052,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46524</v>
+                                    <v>100108</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>36335</v>
+                                    <v>59175</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>31916</v>
+                                    <v>22091</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>19763</v>
+                                    <v>13879</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>6</b>
-                                    <v>12643</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>10</b>
-                                    <v>14362</v>
+                                    <b>8</b>
+                                    <v>18520</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
-                                    <b>65</b>
-                                    <v>11538</v>
+                                    <a>8</a>
+                                    <b>152</b>
+                                    <v>14104</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10100,27 +10087,27 @@
         </relation>
         <relation>
             <name>fun_decls</name>
-            <cardinality>4154268</cardinality>
+            <cardinality>4155304</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4148376</v>
+                    <v>4149410</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>3974186</v>
+                    <v>3975060</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>604076</v>
+                    <v>604209</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1664800</v>
+                    <v>1665166</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2768243</v>
+                    <v>2768852</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10134,7 +10121,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4148376</v>
+                                    <v>4149410</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10150,12 +10137,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4142483</v>
+                                    <v>4143517</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5892</v>
+                                    <v>5893</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10171,7 +10158,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4148376</v>
+                                    <v>4149410</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10187,7 +10174,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4148376</v>
+                                    <v>4149410</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10203,12 +10190,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3814851</v>
+                                    <v>3815567</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>159335</v>
+                                    <v>159493</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10224,12 +10211,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3956142</v>
+                                    <v>3957011</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>18044</v>
+                                    <v>18048</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10245,7 +10232,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3974186</v>
+                                    <v>3975060</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10261,12 +10248,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3835842</v>
+                                    <v>3836562</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>138344</v>
+                                    <v>138497</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10282,26 +10269,26 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>290192</v>
+                                    <v>290256</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>219240</v>
+                                    <v>219288</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>48365</v>
+                                    <v>48376</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>506</b>
-                                    <v>45419</v>
+                                    <v>45429</v>
                                 </b>
                                 <b>
                                     <a>555</a>
-                                    <b>10332</b>
+                                    <b>10333</b>
                                     <v>859</v>
                                 </b>
                             </bs>
@@ -10318,22 +10305,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>300749</v>
+                                    <v>300815</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>210401</v>
+                                    <v>210447</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>47628</v>
+                                    <v>47639</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>9941</b>
-                                    <v>45296</v>
+                                    <v>45306</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10349,22 +10336,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>485986</v>
+                                    <v>486093</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>52293</v>
+                                    <v>52305</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>49347</v>
+                                    <v>49358</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>2238</b>
-                                    <v>16449</v>
+                                    <v>16452</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10380,22 +10367,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>449159</v>
+                                    <v>449258</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>69356</v>
+                                    <v>69371</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>55239</v>
+                                    <v>55251</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>4756</b>
-                                    <v>30320</v>
+                                    <v>30327</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10411,22 +10398,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1310039</v>
+                                    <v>1310327</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>190883</v>
+                                    <v>190925</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>11</b>
-                                    <v>127787</v>
+                                    <v>127693</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>3169</b>
-                                    <v>36089</v>
+                                    <v>36220</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10442,17 +10429,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1421255</v>
+                                    <v>1421567</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>138958</v>
+                                    <v>138988</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>3162</b>
-                                    <v>104587</v>
+                                    <v>104610</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10468,12 +10455,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1576417</v>
+                                    <v>1576763</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1596</b>
-                                    <v>88383</v>
+                                    <v>88402</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10489,17 +10476,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1345392</v>
+                                    <v>1345688</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>205000</v>
+                                    <v>205045</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>1592</b>
-                                    <v>114407</v>
+                                    <v>114432</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10515,17 +10502,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2376164</v>
+                                    <v>2376564</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>251770</v>
+                                    <v>251948</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>211</b>
-                                    <v>140308</v>
+                                    <v>140339</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10541,17 +10528,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2395928</v>
+                                    <v>2396332</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>232497</v>
+                                    <v>232671</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>211</b>
-                                    <v>139817</v>
+                                    <v>139848</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10567,12 +10554,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2655309</v>
+                                    <v>2655893</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>211</b>
-                                    <v>112934</v>
+                                    <v>112959</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10588,12 +10575,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2729698</v>
+                                    <v>2730298</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>38545</v>
+                                    <v>38553</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10603,22 +10590,22 @@
         </relation>
         <relation>
             <name>fun_def</name>
-            <cardinality>1397440</cardinality>
+            <cardinality>1397747</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1397440</v>
+                    <v>1397747</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>fun_specialized</name>
-            <cardinality>7841</cardinality>
+            <cardinality>7864</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7841</v>
+                    <v>7864</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -10636,11 +10623,11 @@
         </relation>
         <relation>
             <name>fun_decl_specifiers</name>
-            <cardinality>4214909</cardinality>
+            <cardinality>4215835</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1723968</v>
+                    <v>1724347</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -10658,22 +10645,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>360776</v>
+                                    <v>360855</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>258030</v>
+                                    <v>258087</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1082574</v>
+                                    <v>1082812</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>22586</v>
+                                    <v>22591</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10870,26 +10857,26 @@
         </relation>
         <relation>
             <name>fun_decl_empty_throws</name>
-            <cardinality>433439</cardinality>
+            <cardinality>434681</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>433439</v>
+                    <v>434681</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>fun_decl_noexcept</name>
-            <cardinality>139743</cardinality>
+            <cardinality>140571</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>139743</v>
+                    <v>140571</v>
                 </e>
                 <e>
                     <k>constant</k>
-                    <v>139307</v>
+                    <v>140132</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10903,7 +10890,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>139743</v>
+                                    <v>140571</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10919,12 +10906,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>138870</v>
+                                    <v>139693</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>436</v>
+                                    <v>438</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10934,26 +10921,26 @@
         </relation>
         <relation>
             <name>fun_decl_empty_noexcept</name>
-            <cardinality>1156104</cardinality>
+            <cardinality>1156481</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>1156104</v>
+                    <v>1156481</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>fun_decl_typedef_type</name>
-            <cardinality>2760</cardinality>
+            <cardinality>2788</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>2760</v>
+                    <v>2788</v>
                 </e>
                 <e>
                     <k>typedeftype_id</k>
-                    <v>124</v>
+                    <v>125</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10967,7 +10954,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2760</v>
+                                    <v>2788</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11043,11 +11030,11 @@
         </relation>
         <relation>
             <name>fun_requires</name>
-            <cardinality>28932</cardinality>
+            <cardinality>28966</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>10050</v>
+                    <v>10062</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -11055,7 +11042,7 @@
                 </e>
                 <e>
                     <k>constraint</k>
-                    <v>28697</v>
+                    <v>28731</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11069,7 +11056,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9986</v>
+                                    <v>9998</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11090,27 +11077,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7227</v>
+                                    <v>7236</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>491</v>
+                                    <v>492</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>855</v>
+                                    <v>856</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>13</b>
-                                    <v>320</v>
+                                    <v>321</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>1133</v>
+                                    <v>1134</v>
                                 </b>
                                 <b>
                                     <a>19</a>
@@ -11173,7 +11160,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28461</v>
+                                    <v>28495</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11194,7 +11181,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28697</v>
+                                    <v>28731</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11204,19 +11191,19 @@
         </relation>
         <relation>
             <name>param_decl_bind</name>
-            <cardinality>7218351</cardinality>
+            <cardinality>7220306</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7218351</v>
+                    <v>7220306</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>7856</v>
+                    <v>7858</v>
                 </e>
                 <e>
                     <k>fun_decl</k>
-                    <v>3488446</v>
+                    <v>3489335</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11230,7 +11217,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7218351</v>
+                                    <v>7220306</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11246,7 +11233,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7218351</v>
+                                    <v>7220306</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11262,7 +11249,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3928</v>
+                                    <v>3929</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -11281,12 +11268,12 @@
                                 </b>
                                 <b>
                                     <a>343</a>
-                                    <b>16310</b>
+                                    <b>16311</b>
                                     <v>613</v>
                                 </b>
                                 <b>
-                                    <a>28418</a>
-                                    <b>28419</b>
+                                    <a>28419</a>
+                                    <b>28420</b>
                                     <v>122</v>
                                 </b>
                             </bs>
@@ -11303,7 +11290,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3928</v>
+                                    <v>3929</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -11322,12 +11309,12 @@
                                 </b>
                                 <b>
                                     <a>343</a>
-                                    <b>16310</b>
+                                    <b>16311</b>
                                     <v>613</v>
                                 </b>
                                 <b>
-                                    <a>28418</a>
-                                    <b>28419</b>
+                                    <a>28419</a>
+                                    <b>28420</b>
                                     <v>122</v>
                                 </b>
                             </bs>
@@ -11344,27 +11331,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1486438</v>
+                                    <v>1486764</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>972463</v>
+                                    <v>972677</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>592291</v>
+                                    <v>592544</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>285895</v>
+                                    <v>285958</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>151356</v>
+                                    <v>151389</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11380,27 +11367,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1486438</v>
+                                    <v>1486764</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>972463</v>
+                                    <v>972677</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>592291</v>
+                                    <v>592544</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>285895</v>
+                                    <v>285958</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>151356</v>
+                                    <v>151389</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11410,27 +11397,27 @@
         </relation>
         <relation>
             <name>var_decls</name>
-            <cardinality>9442668</cardinality>
+            <cardinality>9417486</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9436285</v>
+                    <v>9411101</v>
                 </e>
                 <e>
                     <k>variable</k>
-                    <v>9098463</v>
+                    <v>9072837</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1440773</v>
+                    <v>1441089</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>838906</v>
+                    <v>839090</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>6175671</v>
+                    <v>6177029</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11444,7 +11431,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9436285</v>
+                                    <v>9411101</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11460,12 +11447,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9429901</v>
+                                    <v>9404717</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6383</v>
+                                    <v>6384</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11481,7 +11468,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9436285</v>
+                                    <v>9411101</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11497,7 +11484,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9436285</v>
+                                    <v>9411101</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11513,12 +11500,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8778319</v>
+                                    <v>8752254</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>320144</v>
+                                    <v>320583</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11534,12 +11521,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9046170</v>
+                                    <v>9020532</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>52293</v>
+                                    <v>52305</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11555,12 +11542,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8994735</v>
+                                    <v>8969087</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>103727</v>
+                                    <v>103750</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11576,12 +11563,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8857496</v>
+                                    <v>8831448</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>240967</v>
+                                    <v>241389</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11597,27 +11584,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>839151</v>
+                                    <v>839213</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>280617</v>
+                                    <v>280556</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>127296</v>
+                                    <v>127570</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>11</b>
-                                    <v>112934</v>
+                                    <v>112836</v>
                                 </b>
                                 <b>
                                     <a>11</a>
-                                    <b>2963</b>
-                                    <v>80772</v>
+                                    <b>2786</b>
+                                    <v>80913</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11633,27 +11620,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>860388</v>
+                                    <v>860454</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>265764</v>
+                                    <v>265699</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>122141</v>
+                                    <v>122413</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>11</b>
-                                    <v>112566</v>
+                                    <v>112468</v>
                                 </b>
                                 <b>
                                     <a>11</a>
-                                    <b>2886</b>
-                                    <v>79913</v>
+                                    <b>2709</b>
+                                    <v>80053</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11669,22 +11656,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1104793</v>
+                                    <v>1105036</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>191006</v>
+                                    <v>191048</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>116371</v>
+                                    <v>116397</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>1038</b>
-                                    <v>28601</v>
+                                    <v>28608</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11700,27 +11687,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>974304</v>
+                                    <v>974519</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>215189</v>
+                                    <v>215236</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>104587</v>
+                                    <v>104610</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>15</b>
-                                    <v>109865</v>
+                                    <v>109889</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>2622</b>
-                                    <v>36826</v>
+                                    <v>36834</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11736,32 +11723,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>457507</v>
+                                    <v>457239</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>161668</v>
+                                    <v>162194</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>59290</v>
+                                    <v>59303</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>64814</v>
+                                    <v>64583</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>24</b>
-                                    <v>63341</v>
+                                    <v>63969</v>
                                 </b>
                                 <b>
                                     <a>24</a>
                                     <b>27139</b>
-                                    <v>32284</v>
+                                    <v>31800</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11777,32 +11764,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>468432</v>
+                                    <v>468166</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>161668</v>
+                                    <v>162194</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>55116</v>
+                                    <v>55129</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>71197</v>
+                                    <v>70845</v>
                                 </b>
                                 <b>
                                     <a>8</a>
-                                    <b>44</b>
-                                    <v>63586</v>
+                                    <b>43</b>
+                                    <v>63355</v>
                                 </b>
                                 <b>
-                                    <a>44</a>
+                                    <a>43</a>
                                     <b>26704</b>
-                                    <v>18904</v>
+                                    <v>19399</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11818,22 +11805,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>642744</v>
+                                    <v>642885</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>110847</v>
+                                    <v>110871</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>11</b>
-                                    <v>64078</v>
+                                    <v>64092</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>3463</b>
-                                    <v>21236</v>
+                                    <v>21241</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11849,27 +11836,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>484758</v>
+                                    <v>484865</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>180940</v>
+                                    <v>180980</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>51311</v>
+                                    <v>51322</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>63955</v>
+                                    <v>63969</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>22619</b>
-                                    <v>57940</v>
+                                    <v>57953</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11885,17 +11872,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5670781</v>
+                                    <v>5668589</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>16</b>
-                                    <v>465117</v>
+                                    <v>468780</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>2943</b>
-                                    <v>39772</v>
+                                    <v>39658</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11911,12 +11898,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5751431</v>
+                                    <v>5749257</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>2935</b>
-                                    <v>424240</v>
+                                    <v>427771</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11932,12 +11919,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5874922</v>
+                                    <v>5876213</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>2555</b>
-                                    <v>300749</v>
+                                    <v>300815</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11953,12 +11940,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6163519</v>
+                                    <v>6164873</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>12152</v>
+                                    <v>12155</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11968,33 +11955,33 @@
         </relation>
         <relation>
             <name>var_def</name>
-            <cardinality>3707686</cardinality>
+            <cardinality>3684804</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3707686</v>
+                    <v>3684804</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>var_specialized</name>
-            <cardinality>641</cardinality>
+            <cardinality>642</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>641</v>
+                    <v>642</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>var_decl_specifiers</name>
-            <cardinality>481567</cardinality>
+            <cardinality>481672</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>481567</v>
+                    <v>481672</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -12012,7 +11999,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>481567</v>
+                                    <v>481672</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12053,18 +12040,18 @@
         </relation>
         <relation>
             <name>is_structured_binding</name>
-            <cardinality>940</cardinality>
+            <cardinality>942</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>940</v>
+                    <v>942</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>var_requires</name>
-            <cardinality>384</cardinality>
+            <cardinality>385</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -12072,7 +12059,7 @@
                 </e>
                 <e>
                     <k>constraint</k>
-                    <v>384</v>
+                    <v>385</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12112,7 +12099,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>384</v>
+                                    <v>385</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12122,19 +12109,19 @@
         </relation>
         <relation>
             <name>type_decls</name>
-            <cardinality>1639390</cardinality>
+            <cardinality>1639750</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1639390</v>
+                    <v>1639750</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1620731</v>
+                    <v>1621088</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>1543273</v>
+                    <v>1543612</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12148,7 +12135,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1639390</v>
+                                    <v>1639750</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12164,7 +12151,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1639390</v>
+                                    <v>1639750</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12180,12 +12167,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1604650</v>
+                                    <v>1605003</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>16080</v>
+                                    <v>16084</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12201,12 +12188,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1604773</v>
+                                    <v>1605126</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>15958</v>
+                                    <v>15961</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12222,12 +12209,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1513198</v>
+                                    <v>1513531</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>64</b>
-                                    <v>30074</v>
+                                    <v>30081</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12243,12 +12230,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1513321</v>
+                                    <v>1513653</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>64</b>
-                                    <v>29952</v>
+                                    <v>29958</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12258,37 +12245,37 @@
         </relation>
         <relation>
             <name>type_def</name>
-            <cardinality>1092272</cardinality>
+            <cardinality>1092512</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1092272</v>
+                    <v>1092512</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>type_decl_top</name>
-            <cardinality>676616</cardinality>
+            <cardinality>676228</cardinality>
             <columnsizes>
                 <e>
                     <k>type_decl</k>
-                    <v>676616</v>
+                    <v>676228</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>type_requires</name>
-            <cardinality>7634</cardinality>
+            <cardinality>7643</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2031</v>
+                    <v>2033</v>
                 </e>
                 <e>
                     <k>constraint</k>
-                    <v>7612</v>
+                    <v>7621</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12302,17 +12289,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1005</v>
+                                    <v>1006</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>106</v>
+                                    <v>107</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>598</v>
+                                    <v>599</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -12338,7 +12325,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7591</v>
+                                    <v>7600</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12353,23 +12340,23 @@
         </relation>
         <relation>
             <name>namespace_decls</name>
-            <cardinality>405513</cardinality>
+            <cardinality>406675</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>405513</v>
+                    <v>406675</v>
                 </e>
                 <e>
                     <k>namespace_id</k>
-                    <v>1768</v>
+                    <v>1773</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>405513</v>
+                    <v>406675</v>
                 </e>
                 <e>
                     <k>bodylocation</k>
-                    <v>405513</v>
+                    <v>406675</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12383,7 +12370,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>405513</v>
+                                    <v>406675</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12399,7 +12386,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>405513</v>
+                                    <v>406675</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12415,7 +12402,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>405513</v>
+                                    <v>406675</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12431,12 +12418,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>363</v>
+                                    <v>364</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>185</v>
+                                    <v>186</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -12497,12 +12484,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>363</v>
+                                    <v>364</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>185</v>
+                                    <v>186</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -12563,12 +12550,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>363</v>
+                                    <v>364</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>185</v>
+                                    <v>186</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -12629,7 +12616,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>405513</v>
+                                    <v>406675</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12645,7 +12632,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>405513</v>
+                                    <v>406675</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12661,7 +12648,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>405513</v>
+                                    <v>406675</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12677,7 +12664,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>405513</v>
+                                    <v>406675</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12693,7 +12680,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>405513</v>
+                                    <v>406675</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12709,7 +12696,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>405513</v>
+                                    <v>406675</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12719,23 +12706,23 @@
         </relation>
         <relation>
             <name>usings</name>
-            <cardinality>269966</cardinality>
+            <cardinality>275176</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>269966</v>
+                    <v>275176</v>
                 </e>
                 <e>
                     <k>element_id</k>
-                    <v>58399</v>
+                    <v>59517</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>26666</v>
+                    <v>27181</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>20</v>
+                    <v>21</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12749,7 +12736,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>269966</v>
+                                    <v>275176</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12765,7 +12752,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>269966</v>
+                                    <v>275176</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12781,7 +12768,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>269966</v>
+                                    <v>275176</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12797,17 +12784,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>50730</v>
+                                    <v>51701</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>5339</v>
+                                    <v>5442</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>134</b>
-                                    <v>2328</v>
+                                    <v>2373</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12823,17 +12810,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>50730</v>
+                                    <v>51701</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>5339</v>
+                                    <v>5442</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>134</b>
-                                    <v>2328</v>
+                                    <v>2373</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12849,7 +12836,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>58399</v>
+                                    <v>59517</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12865,22 +12852,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21043</v>
+                                    <v>21450</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>2276</v>
+                                    <v>2320</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>132</b>
-                                    <v>1930</v>
+                                    <v>1967</v>
                                 </b>
                                 <b>
                                     <a>145</a>
                                     <b>364</b>
-                                    <v>1416</v>
+                                    <v>1443</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12896,22 +12883,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21043</v>
+                                    <v>21450</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>2276</v>
+                                    <v>2320</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>132</b>
-                                    <v>1930</v>
+                                    <v>1967</v>
                                 </b>
                                 <b>
                                     <a>145</a>
                                     <b>364</b>
-                                    <v>1416</v>
+                                    <v>1443</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12927,7 +12914,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26666</v>
+                                    <v>27181</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12946,8 +12933,8 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>25342</a>
-                                    <b>25343</b>
+                                    <a>25341</a>
+                                    <b>25342</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -12967,8 +12954,8 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>5353</a>
-                                    <b>5354</b>
+                                    <a>5352</a>
+                                    <b>5353</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -13000,15 +12987,15 @@
         </relation>
         <relation>
             <name>using_container</name>
-            <cardinality>571131</cardinality>
+            <cardinality>582165</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>20151</v>
+                    <v>20541</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>269966</v>
+                    <v>275176</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13022,42 +13009,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8958</v>
+                                    <v>9131</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1584</v>
+                                    <v>1625</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>1762</v>
+                                    <v>1785</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>2244</v>
+                                    <v>2288</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>26</b>
-                                    <v>1521</v>
+                                    <v>1550</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>136</b>
-                                    <v>797</v>
+                                    <v>812</v>
                                 </b>
                                 <b>
                                     <a>145</a>
                                     <b>146</b>
-                                    <v>2601</v>
+                                    <v>2651</v>
                                 </b>
                                 <b>
                                     <a>146</a>
                                     <b>437</b>
-                                    <v>681</v>
+                                    <v>695</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13073,27 +13060,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>96332</v>
+                                    <v>98184</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>119536</v>
+                                    <v>121848</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>19585</v>
+                                    <v>19964</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>26330</v>
+                                    <v>26839</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>8182</v>
+                                    <v>8340</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13103,27 +13090,27 @@
         </relation>
         <relation>
             <name>static_asserts</name>
-            <cardinality>171628</cardinality>
+            <cardinality>172120</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>171628</v>
+                    <v>172120</v>
                 </e>
                 <e>
                     <k>condition</k>
-                    <v>171628</v>
+                    <v>172120</v>
                 </e>
                 <e>
                     <k>message</k>
-                    <v>38481</v>
+                    <v>38591</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>22434</v>
+                    <v>22499</v>
                 </e>
                 <e>
                     <k>enclosing</k>
-                    <v>6202</v>
+                    <v>6220</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13137,7 +13124,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>171628</v>
+                                    <v>172120</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13153,7 +13140,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>171628</v>
+                                    <v>172120</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13169,7 +13156,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>171628</v>
+                                    <v>172120</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13185,7 +13172,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>171628</v>
+                                    <v>172120</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13201,7 +13188,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>171628</v>
+                                    <v>172120</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13217,7 +13204,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>171628</v>
+                                    <v>172120</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13233,7 +13220,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>171628</v>
+                                    <v>172120</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13249,7 +13236,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>171628</v>
+                                    <v>172120</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13265,32 +13252,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28330</v>
+                                    <v>28411</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>662</v>
+                                    <v>664</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>3585</v>
+                                    <v>3595</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>10</b>
-                                    <v>2043</v>
+                                    <v>2049</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>17</b>
-                                    <v>3101</v>
+                                    <v>3110</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>513</b>
-                                    <v>759</v>
+                                    <v>761</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13306,32 +13293,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28330</v>
+                                    <v>28411</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>662</v>
+                                    <v>664</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>3585</v>
+                                    <v>3595</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>10</b>
-                                    <v>2043</v>
+                                    <v>2049</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>17</b>
-                                    <v>3101</v>
+                                    <v>3110</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>513</b>
-                                    <v>759</v>
+                                    <v>761</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13347,12 +13334,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>35679</v>
+                                    <v>35781</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>33</b>
-                                    <v>2802</v>
+                                    <v>2810</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13368,27 +13355,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30147</v>
+                                    <v>30233</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>355</v>
+                                    <v>356</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>3351</v>
+                                    <v>3361</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>1865</v>
+                                    <v>1870</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>43</b>
-                                    <v>2761</v>
+                                    <v>2769</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13404,37 +13391,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4255</v>
+                                    <v>4268</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3690</v>
+                                    <v>3701</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1720</v>
+                                    <v>1725</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>104</v>
+                                    <v>105</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>4692</v>
+                                    <v>4705</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>13</b>
-                                    <v>428</v>
+                                    <v>429</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>15</b>
-                                    <v>2632</v>
+                                    <v>2640</v>
                                 </b>
                                 <b>
                                     <a>16</a>
@@ -13444,12 +13431,12 @@
                                 <b>
                                     <a>17</a>
                                     <b>18</b>
-                                    <v>4369</v>
+                                    <v>4381</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>52</b>
-                                    <v>492</v>
+                                    <v>494</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13465,37 +13452,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4255</v>
+                                    <v>4268</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3690</v>
+                                    <v>3701</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1720</v>
+                                    <v>1725</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>104</v>
+                                    <v>105</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>4692</v>
+                                    <v>4705</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>13</b>
-                                    <v>428</v>
+                                    <v>429</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>15</b>
-                                    <v>2632</v>
+                                    <v>2640</v>
                                 </b>
                                 <b>
                                     <a>16</a>
@@ -13505,12 +13492,12 @@
                                 <b>
                                     <a>17</a>
                                     <b>18</b>
-                                    <v>4369</v>
+                                    <v>4381</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>52</b>
-                                    <v>492</v>
+                                    <v>494</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13526,17 +13513,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6832</v>
+                                    <v>6851</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7631</v>
+                                    <v>7653</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>7736</v>
+                                    <v>7758</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -13557,32 +13544,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5055</v>
+                                    <v>5069</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8019</v>
+                                    <v>8042</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1461</v>
+                                    <v>1465</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>4716</v>
+                                    <v>4729</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>13</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>2632</v>
+                                    <v>2640</v>
                                 </b>
                                 <b>
                                     <a>16</a>
@@ -13603,22 +13590,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5152</v>
+                                    <v>5167</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>210</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>223</a>
                                     <b>11052</b>
-                                    <v>96</v>
+                                    <v>97</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13634,22 +13621,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5152</v>
+                                    <v>5167</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>210</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>223</a>
                                     <b>11052</b>
-                                    <v>96</v>
+                                    <v>97</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13665,17 +13652,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5305</v>
+                                    <v>5321</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>2936</b>
-                                    <v>419</v>
+                                    <v>421</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13691,17 +13678,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5289</v>
+                                    <v>5304</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>492</v>
+                                    <v>494</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>1929</b>
-                                    <v>419</v>
+                                    <v>421</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13711,23 +13698,23 @@
         </relation>
         <relation>
             <name>params</name>
-            <cardinality>6970509</cardinality>
+            <cardinality>6972041</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6930613</v>
+                    <v>6932137</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>3361394</v>
+                    <v>3362133</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>7856</v>
+                    <v>7858</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1206679</v>
+                    <v>1206945</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13741,7 +13728,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6930613</v>
+                                    <v>6932137</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13757,7 +13744,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6930613</v>
+                                    <v>6932137</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13773,12 +13760,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6890718</v>
+                                    <v>6892233</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>39895</v>
+                                    <v>39904</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13794,27 +13781,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1450593</v>
+                                    <v>1450912</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>920292</v>
+                                    <v>920495</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>570073</v>
+                                    <v>570198</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>276443</v>
+                                    <v>276504</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>143991</v>
+                                    <v>144023</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13830,27 +13817,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1450593</v>
+                                    <v>1450912</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>920292</v>
+                                    <v>920495</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>570073</v>
+                                    <v>570198</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>276443</v>
+                                    <v>276504</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>143991</v>
+                                    <v>144023</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13866,22 +13853,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1757357</v>
+                                    <v>1757744</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1019846</v>
+                                    <v>1020071</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>431360</v>
+                                    <v>431455</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>11</b>
-                                    <v>152829</v>
+                                    <v>152863</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13897,7 +13884,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3928</v>
+                                    <v>3929</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -13938,7 +13925,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3928</v>
+                                    <v>3929</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -13979,7 +13966,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3928</v>
+                                    <v>3929</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14020,27 +14007,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>728672</v>
+                                    <v>728832</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>237039</v>
+                                    <v>237091</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>92925</v>
+                                    <v>92945</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>13</b>
-                                    <v>93539</v>
+                                    <v>93559</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>2574</b>
-                                    <v>54503</v>
+                                    <v>54515</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14056,27 +14043,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>810672</v>
+                                    <v>810850</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>175784</v>
+                                    <v>175823</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>107042</v>
+                                    <v>107065</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>27</b>
-                                    <v>90838</v>
+                                    <v>90858</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>2562</b>
-                                    <v>22341</v>
+                                    <v>22346</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14092,17 +14079,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>981670</v>
+                                    <v>981886</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>167683</v>
+                                    <v>167719</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>65</b>
-                                    <v>57326</v>
+                                    <v>57339</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14112,15 +14099,15 @@
         </relation>
         <relation>
             <name>overrides</name>
-            <cardinality>159700</cardinality>
+            <cardinality>160157</cardinality>
             <columnsizes>
                 <e>
                     <k>new</k>
-                    <v>150954</v>
+                    <v>151386</v>
                 </e>
                 <e>
                     <k>old</k>
-                    <v>17451</v>
+                    <v>17501</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14134,12 +14121,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>142215</v>
+                                    <v>142623</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>8738</v>
+                                    <v>8763</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14155,32 +14142,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9392</v>
+                                    <v>9419</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2366</v>
+                                    <v>2373</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1647</v>
+                                    <v>1652</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>1437</v>
+                                    <v>1441</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>16</b>
-                                    <v>1332</v>
+                                    <v>1336</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>230</b>
-                                    <v>1275</v>
+                                    <v>1279</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14190,19 +14177,19 @@
         </relation>
         <relation>
             <name>membervariables</name>
-            <cardinality>1505529</cardinality>
+            <cardinality>1504665</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1503078</v>
+                    <v>1502215</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>458086</v>
+                    <v>457823</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>644370</v>
+                    <v>644001</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14216,12 +14203,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1500736</v>
+                                    <v>1499874</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>2342</v>
+                                    <v>2340</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14237,7 +14224,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1503078</v>
+                                    <v>1502215</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14253,22 +14240,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>339887</v>
+                                    <v>339692</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>72607</v>
+                                    <v>72565</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>10</b>
-                                    <v>35404</v>
+                                    <v>35384</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>4445</b>
-                                    <v>10185</v>
+                                    <v>10179</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14284,22 +14271,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>357481</v>
+                                    <v>357276</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>64763</v>
+                                    <v>64726</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>57</b>
-                                    <v>34370</v>
+                                    <v>34350</v>
                                 </b>
                                 <b>
                                     <a>60</a>
                                     <b>2186</b>
-                                    <v>1470</v>
+                                    <v>1469</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14315,22 +14302,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>423443</v>
+                                    <v>423200</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>122610</v>
+                                    <v>122539</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>58118</v>
+                                    <v>58085</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>664</b>
-                                    <v>40198</v>
+                                    <v>40175</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14346,17 +14333,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>526499</v>
+                                    <v>526197</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>73315</v>
+                                    <v>73273</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>668</b>
-                                    <v>44555</v>
+                                    <v>44530</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14366,19 +14353,19 @@
         </relation>
         <relation>
             <name>globalvariables</name>
-            <cardinality>661280</cardinality>
+            <cardinality>634536</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>661280</v>
+                    <v>634536</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>10188</v>
+                    <v>10190</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>110724</v>
+                    <v>110749</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14392,7 +14379,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>661280</v>
+                                    <v>634536</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14408,7 +14395,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>661280</v>
+                                    <v>634536</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14424,7 +14411,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6874</v>
+                                    <v>6875</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14443,7 +14430,7 @@
                                 </b>
                                 <b>
                                     <a>20</a>
-                                    <b>80</b>
+                                    <b>74</b>
                                     <v>859</v>
                                 </b>
                                 <b>
@@ -14465,7 +14452,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6997</v>
+                                    <v>6998</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14506,22 +14493,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>92679</v>
+                                    <v>92700</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>9329</v>
+                                    <v>9454</v>
                                 </b>
                                 <b>
                                     <a>8</a>
-                                    <b>139</b>
-                                    <v>8347</v>
+                                    <b>182</b>
+                                    <v>8349</v>
                                 </b>
                                 <b>
-                                    <a>181</a>
+                                    <a>632</a>
                                     <b>1156</b>
-                                    <v>368</v>
+                                    <v>245</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14537,12 +14524,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>93907</v>
+                                    <v>93928</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>16571</v>
+                                    <v>16575</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -14557,19 +14544,19 @@
         </relation>
         <relation>
             <name>localvariables</name>
-            <cardinality>725852</cardinality>
+            <cardinality>733038</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>725852</v>
+                    <v>733038</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>53389</v>
+                    <v>53913</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>101620</v>
+                    <v>102626</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14583,7 +14570,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>725852</v>
+                                    <v>733038</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14599,7 +14586,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>725852</v>
+                                    <v>733038</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14615,37 +14602,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28869</v>
+                                    <v>29150</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7802</v>
+                                    <v>7879</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4041</v>
+                                    <v>4081</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>4065</v>
+                                    <v>4105</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>12</b>
-                                    <v>4113</v>
+                                    <v>4154</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>162</b>
-                                    <v>4005</v>
+                                    <v>4044</v>
                                 </b>
                                 <b>
                                     <a>162</a>
                                     <b>19347</b>
-                                    <v>492</v>
+                                    <v>497</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14661,22 +14648,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>38308</v>
+                                    <v>38683</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6718</v>
+                                    <v>6784</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>4477</v>
+                                    <v>4521</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>3509</b>
-                                    <v>3885</v>
+                                    <v>3923</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14692,32 +14679,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>62532</v>
+                                    <v>63151</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>16037</v>
+                                    <v>16195</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6538</v>
+                                    <v>6602</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>8154</v>
+                                    <v>8235</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>137</b>
-                                    <v>7630</v>
+                                    <v>7705</v>
                                 </b>
                                 <b>
                                     <a>137</a>
                                     <b>7546</b>
-                                    <v>728</v>
+                                    <v>735</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14733,22 +14720,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>84575</v>
+                                    <v>85412</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8410</v>
+                                    <v>8493</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>15</b>
-                                    <v>7682</v>
+                                    <v>7758</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>1509</b>
-                                    <v>952</v>
+                                    <v>961</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14758,11 +14745,11 @@
         </relation>
         <relation>
             <name>autoderivation</name>
-            <cardinality>223904</cardinality>
+            <cardinality>224076</cardinality>
             <columnsizes>
                 <e>
                     <k>var</k>
-                    <v>223904</v>
+                    <v>224076</v>
                 </e>
                 <e>
                     <k>derivation_type</k>
@@ -14780,7 +14767,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>223904</v>
+                                    <v>224076</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14809,8 +14796,8 @@
                                     <v>122</v>
                                 </b>
                                 <b>
-                                    <a>527</a>
-                                    <b>528</b>
+                                    <a>528</a>
+                                    <b>529</b>
                                     <v>122</v>
                                 </b>
                                 <b>
@@ -14826,15 +14813,15 @@
         </relation>
         <relation>
             <name>orphaned_variables</name>
-            <cardinality>43672</cardinality>
+            <cardinality>43930</cardinality>
             <columnsizes>
                 <e>
                     <k>var</k>
-                    <v>43672</v>
+                    <v>43930</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>40449</v>
+                    <v>40689</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14848,7 +14835,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>43672</v>
+                                    <v>43930</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14864,12 +14851,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39610</v>
+                                    <v>39844</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>47</b>
-                                    <v>839</v>
+                                    <v>844</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14879,19 +14866,19 @@
         </relation>
         <relation>
             <name>enumconstants</name>
-            <cardinality>348112</cardinality>
+            <cardinality>347913</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>348112</v>
+                    <v>347913</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>41614</v>
+                    <v>41590</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>13944</v>
+                    <v>13936</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -14899,11 +14886,11 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>347731</v>
+                    <v>347531</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>320714</v>
+                    <v>320530</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14917,7 +14904,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>348112</v>
+                                    <v>347913</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14933,7 +14920,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>348112</v>
+                                    <v>347913</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14949,7 +14936,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>348112</v>
+                                    <v>347913</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14965,7 +14952,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>348112</v>
+                                    <v>347913</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14981,7 +14968,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>348112</v>
+                                    <v>347913</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14997,57 +14984,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1525</v>
+                                    <v>1524</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5828</v>
+                                    <v>5824</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>8715</v>
+                                    <v>8710</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>5555</v>
+                                    <v>5552</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>4575</v>
+                                    <v>4572</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>2560</v>
+                                    <v>2558</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>1960</v>
+                                    <v>1959</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>10</b>
-                                    <v>2995</v>
+                                    <v>2994</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>15</b>
-                                    <v>3431</v>
+                                    <v>3429</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>33</b>
-                                    <v>3159</v>
+                                    <v>3157</v>
                                 </b>
                                 <b>
                                     <a>33</a>
                                     <b>257</b>
-                                    <v>1307</v>
+                                    <v>1306</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15063,57 +15050,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1525</v>
+                                    <v>1524</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5828</v>
+                                    <v>5824</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>8715</v>
+                                    <v>8710</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>5555</v>
+                                    <v>5552</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>4575</v>
+                                    <v>4572</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>2560</v>
+                                    <v>2558</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>1960</v>
+                                    <v>1959</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>10</b>
-                                    <v>2995</v>
+                                    <v>2994</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>15</b>
-                                    <v>3431</v>
+                                    <v>3429</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>33</b>
-                                    <v>3159</v>
+                                    <v>3157</v>
                                 </b>
                                 <b>
                                     <a>33</a>
                                     <b>257</b>
-                                    <v>1307</v>
+                                    <v>1306</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15129,7 +15116,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>41614</v>
+                                    <v>41590</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15145,57 +15132,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1525</v>
+                                    <v>1524</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5828</v>
+                                    <v>5824</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>8715</v>
+                                    <v>8710</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>5555</v>
+                                    <v>5552</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>4575</v>
+                                    <v>4572</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>2560</v>
+                                    <v>2558</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>1960</v>
+                                    <v>1959</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>10</b>
-                                    <v>2995</v>
+                                    <v>2994</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>15</b>
-                                    <v>3431</v>
+                                    <v>3429</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>33</b>
-                                    <v>3159</v>
+                                    <v>3157</v>
                                 </b>
                                 <b>
                                     <a>33</a>
                                     <b>257</b>
-                                    <v>1307</v>
+                                    <v>1306</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15211,52 +15198,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2124</v>
+                                    <v>2123</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6046</v>
+                                    <v>6042</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>8769</v>
+                                    <v>8764</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>5501</v>
+                                    <v>5498</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>4575</v>
+                                    <v>4572</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>2505</v>
+                                    <v>2504</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>1851</v>
+                                    <v>1850</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>3812</v>
+                                    <v>3810</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>17</b>
-                                    <v>3213</v>
+                                    <v>3211</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>165</b>
-                                    <v>3159</v>
+                                    <v>3157</v>
                                 </b>
                                 <b>
                                     <a>256</a>
@@ -15277,22 +15264,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2777</v>
+                                    <v>2776</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2233</v>
+                                    <v>2231</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2287</v>
+                                    <v>2286</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1198</v>
+                                    <v>1197</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -15302,7 +15289,7 @@
                                 <b>
                                     <a>9</a>
                                     <b>12</b>
-                                    <v>1089</v>
+                                    <v>1088</v>
                                 </b>
                                 <b>
                                     <a>12</a>
@@ -15312,12 +15299,12 @@
                                 <b>
                                     <a>20</a>
                                     <b>59</b>
-                                    <v>1089</v>
+                                    <v>1088</v>
                                 </b>
                                 <b>
                                     <a>64</a>
                                     <b>765</b>
-                                    <v>980</v>
+                                    <v>979</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15333,22 +15320,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2777</v>
+                                    <v>2776</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2233</v>
+                                    <v>2231</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2287</v>
+                                    <v>2286</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1198</v>
+                                    <v>1197</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -15358,7 +15345,7 @@
                                 <b>
                                     <a>9</a>
                                     <b>12</b>
-                                    <v>1089</v>
+                                    <v>1088</v>
                                 </b>
                                 <b>
                                     <a>12</a>
@@ -15368,12 +15355,12 @@
                                 <b>
                                     <a>20</a>
                                     <b>59</b>
-                                    <v>1089</v>
+                                    <v>1088</v>
                                 </b>
                                 <b>
                                     <a>64</a>
                                     <b>765</b>
-                                    <v>980</v>
+                                    <v>979</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15389,7 +15376,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13944</v>
+                                    <v>13936</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15405,22 +15392,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2777</v>
+                                    <v>2776</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2233</v>
+                                    <v>2231</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2287</v>
+                                    <v>2286</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1198</v>
+                                    <v>1197</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -15430,7 +15417,7 @@
                                 <b>
                                     <a>9</a>
                                     <b>12</b>
-                                    <v>1089</v>
+                                    <v>1088</v>
                                 </b>
                                 <b>
                                     <a>12</a>
@@ -15440,12 +15427,12 @@
                                 <b>
                                     <a>20</a>
                                     <b>59</b>
-                                    <v>1089</v>
+                                    <v>1088</v>
                                 </b>
                                 <b>
                                     <a>64</a>
                                     <b>762</b>
-                                    <v>980</v>
+                                    <v>979</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15461,22 +15448,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2777</v>
+                                    <v>2776</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2233</v>
+                                    <v>2231</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2287</v>
+                                    <v>2286</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1198</v>
+                                    <v>1197</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -15486,7 +15473,7 @@
                                 <b>
                                     <a>9</a>
                                     <b>12</b>
-                                    <v>1089</v>
+                                    <v>1088</v>
                                 </b>
                                 <b>
                                     <a>12</a>
@@ -15496,12 +15483,12 @@
                                 <b>
                                     <a>20</a>
                                     <b>59</b>
-                                    <v>1089</v>
+                                    <v>1088</v>
                                 </b>
                                 <b>
                                     <a>64</a>
                                     <b>765</b>
-                                    <v>980</v>
+                                    <v>979</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15597,7 +15584,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347350</v>
+                                    <v>347150</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15618,7 +15605,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347350</v>
+                                    <v>347150</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15639,7 +15626,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347731</v>
+                                    <v>347531</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15655,7 +15642,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347731</v>
+                                    <v>347531</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15671,7 +15658,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347350</v>
+                                    <v>347150</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15692,7 +15679,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>319679</v>
+                                    <v>319496</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15713,7 +15700,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>320714</v>
+                                    <v>320530</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15729,7 +15716,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>319679</v>
+                                    <v>319496</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15750,7 +15737,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>320714</v>
+                                    <v>320530</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15766,7 +15753,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>319679</v>
+                                    <v>319496</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15781,19 +15768,19 @@
         </relation>
         <relation>
             <name>builtintypes</name>
-            <cardinality>7119</cardinality>
+            <cardinality>7121</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7119</v>
+                    <v>7121</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>7119</v>
+                    <v>7121</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>7119</v>
+                    <v>7121</v>
                 </e>
                 <e>
                     <k>size</k>
@@ -15819,7 +15806,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7119</v>
+                                    <v>7121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15835,7 +15822,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7119</v>
+                                    <v>7121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15851,7 +15838,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7119</v>
+                                    <v>7121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15867,7 +15854,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7119</v>
+                                    <v>7121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15883,7 +15870,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7119</v>
+                                    <v>7121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15899,7 +15886,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7119</v>
+                                    <v>7121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15915,7 +15902,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7119</v>
+                                    <v>7121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15931,7 +15918,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7119</v>
+                                    <v>7121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15947,7 +15934,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7119</v>
+                                    <v>7121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15963,7 +15950,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7119</v>
+                                    <v>7121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15979,7 +15966,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7119</v>
+                                    <v>7121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15995,7 +15982,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7119</v>
+                                    <v>7121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16011,7 +15998,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7119</v>
+                                    <v>7121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16027,7 +16014,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7119</v>
+                                    <v>7121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16043,7 +16030,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7119</v>
+                                    <v>7121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16471,17 +16458,75 @@
                 </dep>
             </dependencies>
         </relation>
+        <relation>
+            <name>bit_precise_int_types</name>
+            <cardinality>8</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>8</v>
+                </e>
+                <e>
+                    <k>bit_width</k>
+                    <v>4</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>bit_width</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>8</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>bit_width</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
         <relation>
             <name>derivedtypes</name>
-            <cardinality>2997672</cardinality>
+            <cardinality>2998331</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2997672</v>
+                    <v>2998331</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1445315</v>
+                    <v>1445632</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -16489,7 +16534,7 @@
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1925654</v>
+                    <v>1926078</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16503,7 +16548,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2997672</v>
+                                    <v>2998331</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16519,7 +16564,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2997672</v>
+                                    <v>2998331</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16535,7 +16580,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2997672</v>
+                                    <v>2998331</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16551,17 +16596,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1327838</v>
+                                    <v>1328130</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>23</b>
-                                    <v>108760</v>
+                                    <v>108784</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>4289</b>
-                                    <v>8715</v>
+                                    <v>8717</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16577,7 +16622,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1445315</v>
+                                    <v>1445632</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16593,17 +16638,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1327961</v>
+                                    <v>1328253</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>23</b>
-                                    <v>108638</v>
+                                    <v>108661</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>4289</b>
-                                    <v>8715</v>
+                                    <v>8717</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16742,22 +16787,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1302919</v>
+                                    <v>1303205</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>372438</v>
+                                    <v>372519</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>121650</v>
+                                    <v>121676</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>137</b>
-                                    <v>128647</v>
+                                    <v>128675</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16773,22 +16818,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1304392</v>
+                                    <v>1304679</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>372438</v>
+                                    <v>372519</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>120176</v>
+                                    <v>120203</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>137</b>
-                                    <v>128647</v>
+                                    <v>128675</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16804,22 +16849,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1304760</v>
+                                    <v>1305047</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>373051</v>
+                                    <v>373133</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>121895</v>
+                                    <v>121922</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>125946</v>
+                                    <v>125974</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16829,11 +16874,11 @@
         </relation>
         <relation>
             <name>pointerishsize</name>
-            <cardinality>2221248</cardinality>
+            <cardinality>2221736</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2221248</v>
+                    <v>2221736</v>
                 </e>
                 <e>
                     <k>size</k>
@@ -16855,7 +16900,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2221248</v>
+                                    <v>2221736</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16871,7 +16916,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2221248</v>
+                                    <v>2221736</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16955,19 +17000,19 @@
         </relation>
         <relation>
             <name>arraysizes</name>
-            <cardinality>79299</cardinality>
+            <cardinality>79317</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>79299</v>
+                    <v>79317</v>
                 </e>
                 <e>
                     <k>num_elements</k>
-                    <v>17553</v>
+                    <v>17557</v>
                 </e>
                 <e>
                     <k>bytesize</k>
-                    <v>19886</v>
+                    <v>19890</v>
                 </e>
                 <e>
                     <k>alignment</k>
@@ -16985,7 +17030,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>79299</v>
+                                    <v>79317</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17001,7 +17046,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>79299</v>
+                                    <v>79317</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17017,7 +17062,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>79299</v>
+                                    <v>79317</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17038,7 +17083,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10679</v>
+                                    <v>10682</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -17079,12 +17124,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11538</v>
+                                    <v>11541</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3928</v>
+                                    <v>3929</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -17094,7 +17139,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>11</b>
-                                    <v>1104</v>
+                                    <v>1105</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17110,12 +17155,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11538</v>
+                                    <v>11541</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3928</v>
+                                    <v>3929</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -17146,7 +17191,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12520</v>
+                                    <v>12523</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -17156,7 +17201,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>2700</v>
+                                    <v>2701</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -17166,7 +17211,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>17</b>
-                                    <v>1595</v>
+                                    <v>1596</v>
                                 </b>
                                 <b>
                                     <a>24</a>
@@ -17187,12 +17232,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14362</v>
+                                    <v>14365</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3559</v>
+                                    <v>3560</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -17218,17 +17263,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14607</v>
+                                    <v>14611</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3314</v>
+                                    <v>3315</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>1595</v>
+                                    <v>1596</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -17394,15 +17439,15 @@
         </relation>
         <relation>
             <name>typedefbase</name>
-            <cardinality>1757610</cardinality>
+            <cardinality>1791267</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1757610</v>
+                    <v>1791267</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>835234</v>
+                    <v>851342</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -17416,7 +17461,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1757610</v>
+                                    <v>1791267</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17432,22 +17477,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>660833</v>
+                                    <v>673623</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>80512</v>
+                                    <v>82048</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>63707</v>
+                                    <v>64928</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>4525</b>
-                                    <v>30180</v>
+                                    <v>30742</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17457,15 +17502,15 @@
         </relation>
         <relation>
             <name>decltypes</name>
-            <cardinality>814720</cardinality>
+            <cardinality>814253</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>27572</v>
+                    <v>27556</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>814720</v>
+                    <v>814253</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -17473,7 +17518,7 @@
                 </e>
                 <e>
                     <k>base_type</k>
-                    <v>3342</v>
+                    <v>3340</v>
                 </e>
                 <e>
                     <k>parentheses_would_change_meaning</k>
@@ -17491,17 +17536,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9740</v>
+                                    <v>9734</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3649</v>
+                                    <v>3647</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>3627</v>
+                                    <v>3625</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -17511,12 +17556,12 @@
                                 <b>
                                     <a>23</a>
                                     <b>24</b>
-                                    <v>3254</v>
+                                    <v>3252</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>30</b>
-                                    <v>3144</v>
+                                    <v>3142</v>
                                 </b>
                                 <b>
                                     <a>32</a>
@@ -17526,7 +17571,7 @@
                                 <b>
                                     <a>171</a>
                                     <b>172</b>
-                                    <v>3078</v>
+                                    <v>3076</v>
                                 </b>
                                 <b>
                                     <a>173</a>
@@ -17547,7 +17592,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27572</v>
+                                    <v>27556</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17563,7 +17608,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27572</v>
+                                    <v>27556</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17579,7 +17624,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27572</v>
+                                    <v>27556</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17595,7 +17640,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>814720</v>
+                                    <v>814253</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17611,7 +17656,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>814720</v>
+                                    <v>814253</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17627,7 +17672,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>814720</v>
+                                    <v>814253</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17643,7 +17688,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>814720</v>
+                                    <v>814253</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17723,12 +17768,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1209</v>
+                                    <v>1208</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1033</v>
+                                    <v>1032</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -17769,7 +17814,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1165</v>
+                                    <v>1164</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -17815,7 +17860,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3342</v>
+                                    <v>3340</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17831,7 +17876,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3342</v>
+                                    <v>3340</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17905,15 +17950,15 @@
         </relation>
         <relation>
             <name>type_operators</name>
-            <cardinality>7954</cardinality>
+            <cardinality>7964</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7954</v>
+                    <v>7964</v>
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>7184</v>
+                    <v>7193</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -17921,7 +17966,7 @@
                 </e>
                 <e>
                     <k>base_type</k>
-                    <v>5217</v>
+                    <v>5223</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -17935,7 +17980,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7954</v>
+                                    <v>7964</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17951,7 +17996,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7954</v>
+                                    <v>7964</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17967,7 +18012,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7954</v>
+                                    <v>7964</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17983,12 +18028,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6415</v>
+                                    <v>6422</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>769</v>
+                                    <v>770</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18004,12 +18049,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6415</v>
+                                    <v>6422</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>769</v>
+                                    <v>770</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18025,7 +18070,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7163</v>
+                                    <v>7172</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18139,12 +18184,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3571</v>
+                                    <v>3575</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>940</v>
+                                    <v>942</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -18170,12 +18215,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3720</v>
+                                    <v>3725</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1026</v>
+                                    <v>1027</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -18201,12 +18246,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4020</v>
+                                    <v>4024</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1176</v>
+                                    <v>1177</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -18221,19 +18266,19 @@
         </relation>
         <relation>
             <name>usertypes</name>
-            <cardinality>4203790</cardinality>
+            <cardinality>4280805</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4203790</v>
+                    <v>4280805</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>950343</v>
+                    <v>966486</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>125</v>
+                    <v>128</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18247,7 +18292,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4203790</v>
+                                    <v>4280805</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18263,7 +18308,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4203790</v>
+                                    <v>4280805</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18279,22 +18324,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>681205</v>
+                                    <v>692667</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>160794</v>
+                                    <v>163369</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>72561</v>
+                                    <v>73996</v>
                                 </b>
                                 <b>
                                     <a>8</a>
-                                    <b>33452</b>
-                                    <v>35782</v>
+                                    <b>33429</b>
+                                    <v>36452</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18310,12 +18355,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>898500</v>
+                                    <v>913640</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>51842</v>
+                                    <v>52845</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18349,8 +18394,8 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>1662</a>
-                                    <b>1663</b>
+                                    <a>1557</a>
+                                    <b>1558</b>
                                     <v>10</v>
                                 </b>
                                 <b>
@@ -18369,8 +18414,8 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>21723</a>
-                                    <b>21724</b>
+                                    <a>21713</a>
+                                    <b>21714</b>
                                     <v>10</v>
                                 </b>
                                 <b>
@@ -18379,13 +18424,13 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>99064</a>
-                                    <b>99065</b>
+                                    <a>98810</a>
+                                    <b>98811</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>167547</a>
-                                    <b>167548</b>
+                                    <a>167516</a>
+                                    <b>167517</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -18450,13 +18495,13 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>12272</a>
-                                    <b>12273</b>
+                                    <a>12260</a>
+                                    <b>12261</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>61190</a>
-                                    <b>61191</b>
+                                    <a>60993</a>
+                                    <b>60994</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -18467,19 +18512,19 @@
         </relation>
         <relation>
             <name>usertypesize</name>
-            <cardinality>1421775</cardinality>
+            <cardinality>1445377</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1421775</v>
+                    <v>1445377</v>
                 </e>
                 <e>
                     <k>size</k>
-                    <v>1468</v>
+                    <v>1497</v>
                 </e>
                 <e>
                     <k>alignment</k>
-                    <v>83</v>
+                    <v>85</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18493,7 +18538,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1421775</v>
+                                    <v>1445377</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18509,7 +18554,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1421775</v>
+                                    <v>1445377</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18525,52 +18570,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>461</v>
+                                    <v>470</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>188</v>
+                                    <v>192</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>94</v>
+                                    <v>96</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>94</v>
+                                    <v>96</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>19</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>30</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>30</a>
                                     <b>115</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>118</a>
                                     <b>1731</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>1840</a>
-                                    <b>106128</b>
-                                    <v>52</v>
+                                    <b>105869</b>
+                                    <v>53</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18586,17 +18631,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1195</v>
+                                    <v>1219</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>178</v>
+                                    <v>181</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>94</v>
+                                    <v>96</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18635,8 +18680,8 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>2147</a>
-                                    <b>2148</b>
+                                    <a>2042</a>
+                                    <b>2043</b>
                                     <v>10</v>
                                 </b>
                                 <b>
@@ -18645,8 +18690,8 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>121323</a>
-                                    <b>121324</b>
+                                    <a>121064</a>
+                                    <b>121065</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -18663,7 +18708,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20</v>
+                                    <v>21</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -18703,26 +18748,26 @@
         </relation>
         <relation>
             <name>usertype_final</name>
-            <cardinality>11293</cardinality>
+            <cardinality>11295</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>11293</v>
+                    <v>11295</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>usertype_uuid</name>
-            <cardinality>47615</cardinality>
+            <cardinality>47751</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>47615</v>
+                    <v>47751</v>
                 </e>
                 <e>
                     <k>uuid</k>
-                    <v>47074</v>
+                    <v>47209</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18736,7 +18781,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>47615</v>
+                                    <v>47751</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18752,12 +18797,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46533</v>
+                                    <v>46666</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>541</v>
+                                    <v>542</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18767,15 +18812,15 @@
         </relation>
         <relation>
             <name>usertype_alias_kind</name>
-            <cardinality>1757610</cardinality>
+            <cardinality>1791267</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1757610</v>
+                    <v>1791267</v>
                 </e>
                 <e>
                     <k>alias_kind</k>
-                    <v>20</v>
+                    <v>21</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18789,7 +18834,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1757610</v>
+                                    <v>1791267</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18803,13 +18848,13 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>36943</a>
-                                    <b>36944</b>
+                                    <a>36937</a>
+                                    <b>36938</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>130604</a>
-                                    <b>130605</b>
+                                    <a>130579</a>
+                                    <b>130580</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -18820,26 +18865,26 @@
         </relation>
         <relation>
             <name>nontype_template_parameters</name>
-            <cardinality>754374</cardinality>
+            <cardinality>758842</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>754374</v>
+                    <v>758842</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>type_template_type_constraint</name>
-            <cardinality>26986</cardinality>
+            <cardinality>27018</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>13300</v>
+                    <v>13316</v>
                 </e>
                 <e>
                     <k>constraint</k>
-                    <v>25852</v>
+                    <v>25883</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18853,27 +18898,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10157</v>
+                                    <v>10169</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>898</v>
+                                    <v>899</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>1026</v>
+                                    <v>1027</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>14</b>
-                                    <v>1111</v>
+                                    <v>1113</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>17</b>
-                                    <v>106</v>
+                                    <v>107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18889,12 +18934,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>24719</v>
+                                    <v>24749</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1133</v>
+                                    <v>1134</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18904,15 +18949,15 @@
         </relation>
         <relation>
             <name>mangled_name</name>
-            <cardinality>8184676</cardinality>
+            <cardinality>8178495</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>8184676</v>
+                    <v>8178495</v>
                 </e>
                 <e>
                     <k>mangled_name</k>
-                    <v>6352070</v>
+                    <v>6345485</v>
                 </e>
                 <e>
                     <k>is_complete</k>
@@ -18930,7 +18975,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8184676</v>
+                                    <v>8178495</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18946,7 +18991,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8184676</v>
+                                    <v>8178495</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18962,12 +19007,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5997431</v>
+                                    <v>5990769</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1120</b>
-                                    <v>354638</v>
+                                    <v>354716</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18983,7 +19028,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6352070</v>
+                                    <v>6345485</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19002,8 +19047,8 @@
                                     <v>122</v>
                                 </b>
                                 <b>
-                                    <a>66669</a>
-                                    <b>66670</b>
+                                    <a>66604</a>
+                                    <b>66605</b>
                                     <v>122</v>
                                 </b>
                             </bs>
@@ -19023,8 +19068,8 @@
                                     <v>122</v>
                                 </b>
                                 <b>
-                                    <a>51740</a>
-                                    <b>51741</b>
+                                    <a>51675</a>
+                                    <b>51676</b>
                                     <v>122</v>
                                 </b>
                             </bs>
@@ -19035,59 +19080,59 @@
         </relation>
         <relation>
             <name>is_pod_class</name>
-            <cardinality>608655</cardinality>
+            <cardinality>611214</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>608655</v>
+                    <v>611214</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_standard_layout_class</name>
-            <cardinality>1183332</cardinality>
+            <cardinality>1203445</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1183332</v>
+                    <v>1203445</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_complete</name>
-            <cardinality>1403669</cardinality>
+            <cardinality>1428043</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1403669</v>
+                    <v>1428043</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_class_template</name>
-            <cardinality>230554</cardinality>
+            <cardinality>235013</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>230554</v>
+                    <v>235013</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>class_instantiation</name>
-            <cardinality>1183835</cardinality>
+            <cardinality>1203980</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>1180845</v>
+                    <v>1200900</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>71774</v>
+                    <v>73130</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19101,12 +19146,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1178758</v>
+                                    <v>1198740</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>2087</v>
+                                    <v>2160</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19122,47 +19167,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20340</v>
+                                    <v>20787</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12777</v>
+                                    <v>13034</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>7101</v>
+                                    <v>7217</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>4657</v>
+                                    <v>4758</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>6189</v>
+                                    <v>6330</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>10</b>
-                                    <v>5685</v>
+                                    <v>5752</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>17</b>
-                                    <v>5864</v>
+                                    <v>5956</v>
                                 </b>
                                 <b>
                                     <a>17</a>
-                                    <b>52</b>
-                                    <v>5402</v>
+                                    <b>53</b>
+                                    <v>5560</v>
                                 </b>
                                 <b>
-                                    <a>52</a>
+                                    <a>53</a>
                                     <b>4358</b>
-                                    <v>3755</v>
+                                    <v>3731</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19172,19 +19217,19 @@
         </relation>
         <relation>
             <name>class_template_argument</name>
-            <cardinality>3001639</cardinality>
+            <cardinality>3054583</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>1423558</v>
+                    <v>1448328</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>1174</v>
+                    <v>1197</v>
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>844622</v>
+                    <v>860881</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19198,27 +19243,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>599423</v>
+                                    <v>609999</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>434747</v>
+                                    <v>442010</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>263557</v>
+                                    <v>268054</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>107724</v>
+                                    <v>109807</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>113</b>
-                                    <v>18106</v>
+                                    <v>18456</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19234,22 +19279,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>628313</v>
+                                    <v>639063</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>448888</v>
+                                    <v>456788</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>263630</v>
+                                    <v>268151</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>113</b>
-                                    <v>82726</v>
+                                    <v>84325</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19270,32 +19315,32 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>744</v>
+                                    <v>759</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>30</b>
-                                    <v>94</v>
+                                    <v>96</v>
                                 </b>
                                 <b>
                                     <a>33</a>
                                     <b>90</b>
-                                    <v>94</v>
+                                    <v>96</v>
                                 </b>
                                 <b>
                                     <a>95</a>
                                     <b>453</b>
-                                    <v>94</v>
+                                    <v>96</v>
                                 </b>
                                 <b>
                                     <a>643</a>
                                     <b>7142</b>
-                                    <v>94</v>
+                                    <v>96</v>
                                 </b>
                                 <b>
                                     <a>11996</a>
-                                    <b>135692</b>
-                                    <v>41</v>
+                                    <b>135434</b>
+                                    <v>42</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19316,32 +19361,32 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>744</v>
+                                    <v>759</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>16</b>
-                                    <v>104</v>
+                                    <v>106</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>35</b>
-                                    <v>94</v>
+                                    <v>96</v>
                                 </b>
                                 <b>
                                     <a>37</a>
                                     <b>155</b>
-                                    <v>94</v>
+                                    <v>96</v>
                                 </b>
                                 <b>
                                     <a>196</a>
                                     <b>3290</b>
-                                    <v>94</v>
+                                    <v>96</v>
                                 </b>
                                 <b>
-                                    <a>11129</a>
-                                    <b>46222</b>
-                                    <v>31</v>
+                                    <a>11131</a>
+                                    <b>46219</b>
+                                    <v>32</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19357,27 +19402,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>524281</v>
+                                    <v>534431</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>174662</v>
+                                    <v>178008</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>77711</v>
+                                    <v>79385</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>44</b>
-                                    <v>63413</v>
+                                    <b>46</b>
+                                    <v>64693</v>
                                 </b>
                                 <b>
-                                    <a>44</a>
-                                    <b>13910</b>
-                                    <v>4552</v>
+                                    <a>46</a>
+                                    <b>13875</b>
+                                    <v>4362</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19393,17 +19438,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>737475</v>
+                                    <v>752067</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>87866</v>
+                                    <v>89169</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>22</b>
-                                    <v>19281</v>
+                                    <v>19643</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19413,19 +19458,19 @@
         </relation>
         <relation>
             <name>class_template_argument_value</name>
-            <cardinality>508958</cardinality>
+            <cardinality>511973</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>209162</v>
+                    <v>210401</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>302</v>
+                    <v>303</v>
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>508824</v>
+                    <v>511838</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19439,17 +19484,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>159884</v>
+                                    <v>160831</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>42732</v>
+                                    <v>42985</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>6545</v>
+                                    <v>6584</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19465,22 +19510,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>152130</v>
+                                    <v>153031</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>39878</v>
+                                    <v>40115</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>52</b>
-                                    <v>15911</v>
+                                    <v>16005</v>
                                 </b>
                                 <b>
                                     <a>54</a>
                                     <b>154</b>
-                                    <v>1242</v>
+                                    <v>1249</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19608,12 +19653,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>508690</v>
+                                    <v>511703</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>134</v>
+                                    <v>135</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19629,7 +19674,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>508824</v>
+                                    <v>511838</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19639,15 +19684,15 @@
         </relation>
         <relation>
             <name>class_template_generated_from</name>
-            <cardinality>61420</cardinality>
+            <cardinality>62608</cardinality>
             <columnsizes>
                 <e>
                     <k>template</k>
-                    <v>61420</v>
+                    <v>62608</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>3734</v>
+                    <v>3806</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19661,7 +19706,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>61420</v>
+                                    <v>62608</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19677,47 +19722,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1510</v>
+                                    <v>1539</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>472</v>
+                                    <v>481</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>209</v>
+                                    <v>213</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>178</v>
+                                    <v>181</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>262</v>
+                                    <v>267</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>10</b>
-                                    <v>262</v>
+                                    <v>267</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>16</b>
-                                    <v>283</v>
+                                    <v>288</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>63</b>
-                                    <v>335</v>
+                                    <v>342</v>
                                 </b>
                                 <b>
                                     <a>63</a>
                                     <b>603</b>
-                                    <v>220</v>
+                                    <v>224</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19727,15 +19772,15 @@
         </relation>
         <relation>
             <name>is_proxy_class_for</name>
-            <cardinality>50227</cardinality>
+            <cardinality>51198</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>50227</v>
+                    <v>51198</v>
                 </e>
                 <e>
                     <k>templ_param_id</k>
-                    <v>46922</v>
+                    <v>47830</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19749,7 +19794,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>50227</v>
+                                    <v>51198</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19765,12 +19810,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46167</v>
+                                    <v>47060</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>82</b>
-                                    <v>755</v>
+                                    <v>769</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19780,19 +19825,19 @@
         </relation>
         <relation>
             <name>type_mentions</name>
-            <cardinality>5941339</cardinality>
+            <cardinality>5937930</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5941339</v>
+                    <v>5937930</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>278065</v>
+                    <v>277905</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5885018</v>
+                    <v>5881641</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -19810,7 +19855,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5941339</v>
+                                    <v>5937930</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19826,7 +19871,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5941339</v>
+                                    <v>5937930</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19842,7 +19887,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5941339</v>
+                                    <v>5937930</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19858,42 +19903,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>137480</v>
+                                    <v>137401</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>31210</v>
+                                    <v>31192</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>11656</v>
+                                    <v>11649</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>14979</v>
+                                    <v>14970</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>19935</v>
+                                    <v>19924</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>12</b>
-                                    <v>21787</v>
+                                    <v>21775</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>28</b>
-                                    <v>21025</v>
+                                    <v>21013</v>
                                 </b>
                                 <b>
                                     <a>28</a>
                                     <b>8941</b>
-                                    <v>19990</v>
+                                    <v>19978</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19909,42 +19954,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>137480</v>
+                                    <v>137401</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>31210</v>
+                                    <v>31192</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>11656</v>
+                                    <v>11649</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>14979</v>
+                                    <v>14970</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>19935</v>
+                                    <v>19924</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>12</b>
-                                    <v>21787</v>
+                                    <v>21775</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>28</b>
-                                    <v>21025</v>
+                                    <v>21013</v>
                                 </b>
                                 <b>
                                     <a>28</a>
                                     <b>8941</b>
-                                    <v>19990</v>
+                                    <v>19978</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19960,7 +20005,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>278065</v>
+                                    <v>277905</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19976,12 +20021,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5839318</v>
+                                    <v>5835968</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>45699</v>
+                                    <v>45673</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19997,12 +20042,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5839318</v>
+                                    <v>5835968</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>45699</v>
+                                    <v>45673</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20018,7 +20063,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5885018</v>
+                                    <v>5881641</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20076,26 +20121,26 @@
         </relation>
         <relation>
             <name>is_function_template</name>
-            <cardinality>1311389</cardinality>
+            <cardinality>1311677</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1311389</v>
+                    <v>1311677</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_instantiation</name>
-            <cardinality>959643</cardinality>
+            <cardinality>965225</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>959643</v>
+                    <v>965225</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>180058</v>
+                    <v>181057</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20109,7 +20154,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>959643</v>
+                                    <v>965225</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20125,27 +20170,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>108961</v>
+                                    <v>109539</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>42195</v>
+                                    <v>42444</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>14232</v>
+                                    <v>14317</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>104</b>
-                                    <v>13527</v>
+                                    <v>13608</v>
                                 </b>
                                 <b>
                                     <a>119</a>
-                                    <b>1532</b>
-                                    <v>1141</v>
+                                    <b>1531</b>
+                                    <v>1148</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20155,19 +20200,19 @@
         </relation>
         <relation>
             <name>function_template_argument</name>
-            <cardinality>2464632</cardinality>
+            <cardinality>2479028</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
-                    <v>1448091</v>
+                    <v>1456567</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>469</v>
+                    <v>472</v>
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>293619</v>
+                    <v>295324</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20181,22 +20226,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>787539</v>
+                                    <v>792170</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>407146</v>
+                                    <v>409524</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>169350</v>
+                                    <v>170320</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>15</b>
-                                    <v>84054</v>
+                                    <v>84552</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20212,22 +20257,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>806405</v>
+                                    <v>811147</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>405266</v>
+                                    <v>407633</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>167202</v>
+                                    <v>168158</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>69217</v>
+                                    <v>69627</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20243,7 +20288,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>167</v>
+                                    <v>168</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -20276,18 +20321,18 @@
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>7549</a>
-                                    <b>7550</b>
+                                    <a>7548</a>
+                                    <b>7549</b>
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>19678</a>
-                                    <b>19679</b>
+                                    <a>19676</a>
+                                    <b>19677</b>
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>43139</a>
-                                    <b>43140</b>
+                                    <a>43136</a>
+                                    <b>43137</b>
                                     <v>33</v>
                                 </b>
                             </bs>
@@ -20304,7 +20349,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>167</v>
+                                    <v>168</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -20347,8 +20392,8 @@
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>6081</a>
-                                    <b>6082</b>
+                                    <a>6080</a>
+                                    <b>6081</b>
                                     <v>33</v>
                                 </b>
                             </bs>
@@ -20365,37 +20410,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172204</v>
+                                    <v>173224</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>25914</v>
+                                    <v>26034</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>19536</v>
+                                    <v>19652</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>22457</v>
+                                    <v>22590</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>11</b>
-                                    <v>22960</v>
+                                    <v>23096</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>76</b>
-                                    <v>22960</v>
+                                    <v>23096</v>
                                 </b>
                                 <b>
                                     <a>79</a>
                                     <b>2452</b>
-                                    <v>7586</v>
+                                    <v>7631</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20411,17 +20456,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>253002</v>
+                                    <v>254467</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>31688</v>
+                                    <v>31875</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>15</b>
-                                    <v>8929</v>
+                                    <v>8981</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20431,19 +20476,19 @@
         </relation>
         <relation>
             <name>function_template_argument_value</name>
-            <cardinality>453873</cardinality>
+            <cardinality>456494</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
-                    <v>193888</v>
+                    <v>194969</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>469</v>
+                    <v>472</v>
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>451221</v>
+                    <v>453826</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20457,17 +20502,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>149176</v>
+                                    <v>149992</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>42262</v>
+                                    <v>42512</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>2450</v>
+                                    <v>2464</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20483,22 +20528,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>142362</v>
+                                    <v>143137</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>36085</v>
+                                    <v>36299</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>54</b>
-                                    <v>14669</v>
+                                    <v>14756</v>
                                 </b>
                                 <b>
                                     <a>54</a>
                                     <b>166</b>
-                                    <v>772</v>
+                                    <v>776</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20514,7 +20559,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>167</v>
+                                    <v>168</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20552,13 +20597,13 @@
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>1850</a>
-                                    <b>1851</b>
+                                    <a>1849</a>
+                                    <b>1850</b>
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>2547</a>
-                                    <b>2548</b>
+                                    <a>2546</a>
+                                    <b>2547</b>
                                     <v>33</v>
                                 </b>
                             </bs>
@@ -20575,7 +20620,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>167</v>
+                                    <v>168</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20613,13 +20658,13 @@
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>3813</a>
-                                    <b>3814</b>
+                                    <a>3812</a>
+                                    <b>3813</b>
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>4291</a>
-                                    <b>4292</b>
+                                    <a>4290</a>
+                                    <b>4291</b>
                                     <v>33</v>
                                 </b>
                             </bs>
@@ -20636,12 +20681,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>448569</v>
+                                    <v>451159</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2651</v>
+                                    <v>2667</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20657,7 +20702,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>451221</v>
+                                    <v>453826</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20667,15 +20712,15 @@
         </relation>
         <relation>
             <name>function_template_generated_from</name>
-            <cardinality>864410</cardinality>
+            <cardinality>869530</cardinality>
             <columnsizes>
                 <e>
                     <k>template</k>
-                    <v>864410</v>
+                    <v>869530</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>22154</v>
+                    <v>22286</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20689,7 +20734,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>864410</v>
+                                    <v>869530</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20705,62 +20750,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3591</v>
+                                    <v>3613</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1174</v>
+                                    <v>1181</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>1678</v>
+                                    <v>1688</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>1779</v>
+                                    <v>1789</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>14</b>
-                                    <v>1678</v>
+                                    <v>1688</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>20</b>
-                                    <v>1577</v>
+                                    <v>1587</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>23</b>
-                                    <v>1678</v>
+                                    <v>1688</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>32</b>
-                                    <v>1846</v>
+                                    <v>1857</v>
                                 </b>
                                 <b>
                                     <a>33</a>
                                     <b>66</b>
-                                    <v>2047</v>
+                                    <v>2059</v>
                                 </b>
                                 <b>
                                     <a>70</a>
                                     <b>79</b>
-                                    <v>1376</v>
+                                    <v>1384</v>
                                 </b>
                                 <b>
                                     <a>83</a>
                                     <b>110</b>
-                                    <v>1846</v>
+                                    <v>1857</v>
                                 </b>
                                 <b>
                                     <a>111</a>
                                     <b>370</b>
-                                    <v>1879</v>
+                                    <v>1890</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20770,26 +20815,26 @@
         </relation>
         <relation>
             <name>is_variable_template</name>
-            <cardinality>57694</cardinality>
+            <cardinality>57707</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>57694</v>
+                    <v>57707</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>variable_instantiation</name>
-            <cardinality>596956</cardinality>
+            <cardinality>566269</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>596956</v>
+                    <v>566269</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>36089</v>
+                    <v>36097</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20803,7 +20848,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>596956</v>
+                                    <v>566269</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20819,12 +20864,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14362</v>
+                                    <v>14733</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3928</v>
+                                    <v>3683</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -20834,7 +20879,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>2700</v>
+                                    <v>2701</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -20844,22 +20889,22 @@
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>3191</v>
+                                    <v>3192</v>
                                 </b>
                                 <b>
                                     <a>11</a>
-                                    <b>30</b>
+                                    <b>25</b>
                                     <v>2823</v>
                                 </b>
                                 <b>
-                                    <a>30</a>
+                                    <a>25</a>
                                     <b>94</b>
                                     <v>2823</v>
                                 </b>
                                 <b>
                                     <a>103</a>
                                     <b>1155</b>
-                                    <v>982</v>
+                                    <v>859</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20869,11 +20914,11 @@
         </relation>
         <relation>
             <name>variable_template_argument</name>
-            <cardinality>1128116</cardinality>
+            <cardinality>1073726</cardinality>
             <columnsizes>
                 <e>
                     <k>variable_id</k>
-                    <v>575474</v>
+                    <v>548711</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -20881,7 +20926,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>463276</v>
+                    <v>461782</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20895,22 +20940,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>189165</v>
+                                    <v>179998</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>288964</v>
+                                    <v>272698</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>77703</v>
+                                    <v>77720</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>17</b>
-                                    <v>19640</v>
+                                    <v>18294</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20926,22 +20971,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>206841</v>
+                                    <v>196205</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>276198</v>
+                                    <v>261402</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>75616</v>
+                                    <v>75633</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>17</b>
-                                    <v>16817</v>
+                                    <v>15470</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20955,43 +21000,43 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>27</a>
-                                    <b>28</b>
+                                    <a>22</a>
+                                    <b>23</b>
                                     <v>859</v>
                                 </b>
                                 <b>
-                                    <a>33</a>
-                                    <b>34</b>
+                                    <a>28</a>
+                                    <b>29</b>
                                     <v>368</v>
                                 </b>
                                 <b>
-                                    <a>40</a>
-                                    <b>41</b>
+                                    <a>35</a>
+                                    <b>36</b>
                                     <v>122</v>
                                 </b>
                                 <b>
-                                    <a>72</a>
-                                    <b>73</b>
+                                    <a>67</a>
+                                    <b>68</b>
                                     <v>122</v>
                                 </b>
                                 <b>
-                                    <a>160</a>
-                                    <b>161</b>
+                                    <a>149</a>
+                                    <b>150</b>
                                     <v>122</v>
                                 </b>
                                 <b>
-                                    <a>793</a>
-                                    <b>794</b>
+                                    <a>782</a>
+                                    <b>783</b>
                                     <v>122</v>
                                 </b>
                                 <b>
-                                    <a>3147</a>
-                                    <b>3148</b>
+                                    <a>3003</a>
+                                    <b>3004</b>
                                     <v>122</v>
                                 </b>
                                 <b>
-                                    <a>4688</a>
-                                    <b>4689</b>
+                                    <a>4469</a>
+                                    <b>4470</b>
                                     <v>122</v>
                                 </b>
                             </bs>
@@ -21036,13 +21081,13 @@
                                     <v>122</v>
                                 </b>
                                 <b>
-                                    <a>1465</a>
-                                    <b>1466</b>
+                                    <a>1448</a>
+                                    <b>1449</b>
                                     <v>122</v>
                                 </b>
                                 <b>
-                                    <a>2164</a>
-                                    <b>2165</b>
+                                    <a>2157</a>
+                                    <b>2158</b>
                                     <v>122</v>
                                 </b>
                             </bs>
@@ -21059,22 +21104,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>359671</v>
+                                    <v>361101</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>57694</v>
+                                    <v>56234</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>16</b>
-                                    <v>35476</v>
+                                    <b>17</b>
+                                    <v>35606</v>
                                 </b>
                                 <b>
-                                    <a>16</a>
+                                    <a>17</a>
                                     <b>227</b>
-                                    <v>10434</v>
+                                    <v>8840</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21090,12 +21135,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>429887</v>
+                                    <v>429367</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>33389</v>
+                                    <v>32414</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21105,11 +21150,11 @@
         </relation>
         <relation>
             <name>variable_template_argument_value</name>
-            <cardinality>19763</cardinality>
+            <cardinality>19767</cardinality>
             <columnsizes>
                 <e>
                     <k>variable_id</k>
-                    <v>14730</v>
+                    <v>14733</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -21117,7 +21162,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>19763</v>
+                    <v>19767</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21131,7 +21176,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13257</v>
+                                    <v>13260</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21152,12 +21197,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10434</v>
+                                    <v>10436</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3928</v>
+                                    <v>3929</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -21240,7 +21285,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19763</v>
+                                    <v>19767</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21256,7 +21301,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19763</v>
+                                    <v>19767</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21314,26 +21359,26 @@
         </relation>
         <relation>
             <name>is_alias_template</name>
-            <cardinality>107518</cardinality>
+            <cardinality>108155</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>107518</v>
+                    <v>108155</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>alias_instantiation</name>
-            <cardinality>460184</cardinality>
+            <cardinality>462909</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>460184</v>
+                    <v>462909</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>92312</v>
+                    <v>92858</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21347,7 +21392,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>460184</v>
+                                    <v>462909</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21363,47 +21408,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16549</v>
+                                    <v>16647</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>16817</v>
+                                    <v>16917</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>20040</v>
+                                    <v>20158</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>12487</v>
+                                    <v>12561</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>6713</v>
+                                    <v>6753</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>4800</v>
+                                    <v>4828</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>10</b>
-                                    <v>7821</v>
+                                    <v>7867</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>143</b>
-                                    <v>6948</v>
+                                    <v>6989</v>
                                 </b>
                                 <b>
                                     <a>163</a>
                                     <b>795</b>
-                                    <v>134</v>
+                                    <v>135</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21413,19 +21458,19 @@
         </relation>
         <relation>
             <name>alias_template_argument</name>
-            <cardinality>994218</cardinality>
+            <cardinality>1000106</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>567635</v>
+                    <v>570997</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>302</v>
+                    <v>303</v>
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>127860</v>
+                    <v>128617</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21439,22 +21484,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>276499</v>
+                                    <v>278137</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>182542</v>
+                                    <v>183624</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>87008</v>
+                                    <v>87523</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>10</b>
-                                    <v>21584</v>
+                                    <v>21712</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21470,22 +21515,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>277741</v>
+                                    <v>279387</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>181334</v>
+                                    <v>182408</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>88451</v>
+                                    <v>88975</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>10</b>
-                                    <v>20107</v>
+                                    <v>20226</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21613,32 +21658,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>78247</v>
+                                    <v>78710</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>20308</v>
+                                    <v>20428</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5438</v>
+                                    <v>5470</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>10473</v>
+                                    <v>10535</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>76</b>
-                                    <v>10842</v>
+                                    <v>10906</v>
                                 </b>
                                 <b>
                                     <a>84</a>
                                     <b>4474</b>
-                                    <v>2551</v>
+                                    <v>2566</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21654,17 +21699,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>108928</v>
+                                    <v>109573</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>17321</v>
+                                    <v>17423</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>1611</v>
+                                    <v>1620</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21674,19 +21719,19 @@
         </relation>
         <relation>
             <name>alias_template_argument_value</name>
-            <cardinality>173378</cardinality>
+            <cardinality>174405</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>160790</v>
+                    <v>161743</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>134</v>
+                    <v>135</v>
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>173378</v>
+                    <v>174405</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21700,12 +21745,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>159548</v>
+                                    <v>160493</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1242</v>
+                                    <v>1249</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21721,12 +21766,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>158877</v>
+                                    <v>159818</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>42</b>
-                                    <v>1913</v>
+                                    <v>1924</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21804,7 +21849,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>173378</v>
+                                    <v>174405</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21820,7 +21865,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>173378</v>
+                                    <v>174405</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21830,15 +21875,15 @@
         </relation>
         <relation>
             <name>alias_template_generated_from</name>
-            <cardinality>99932</cardinality>
+            <cardinality>100523</cardinality>
             <columnsizes>
                 <e>
                     <k>template</k>
-                    <v>99932</v>
+                    <v>100523</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>1913</v>
+                    <v>1924</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21852,7 +21897,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>99932</v>
+                                    <v>100523</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21868,42 +21913,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>134</v>
+                                    <v>135</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>134</v>
+                                    <v>135</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>134</v>
+                                    <v>135</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>18</b>
-                                    <v>167</v>
+                                    <v>168</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>20</b>
-                                    <v>134</v>
+                                    <v>135</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>21</b>
-                                    <v>201</v>
+                                    <v>202</v>
                                 </b>
                                 <b>
                                     <a>31</a>
                                     <b>32</b>
-                                    <v>134</v>
+                                    <v>135</v>
                                 </b>
                                 <b>
                                     <a>43</a>
                                     <b>50</b>
-                                    <v>134</v>
+                                    <v>135</v>
                                 </b>
                                 <b>
                                     <a>64</a>
@@ -21913,22 +21958,22 @@
                                 <b>
                                     <a>65</a>
                                     <b>66</b>
-                                    <v>134</v>
+                                    <v>135</v>
                                 </b>
                                 <b>
                                     <a>74</a>
                                     <b>84</b>
-                                    <v>167</v>
+                                    <v>168</v>
                                 </b>
                                 <b>
                                     <a>111</a>
                                     <b>112</b>
-                                    <v>268</v>
+                                    <v>270</v>
                                 </b>
                                 <b>
                                     <a>150</a>
                                     <b>294</b>
-                                    <v>100</v>
+                                    <v>101</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21938,15 +21983,15 @@
         </relation>
         <relation>
             <name>template_template_instantiation</name>
-            <cardinality>6014</cardinality>
+            <cardinality>6116</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>4664</v>
+                    <v>5720</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>1104</v>
+                    <v>3977</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21960,12 +22005,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3314</v>
+                                    <v>5603</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>3</b>
-                                    <v>1350</v>
+                                    <b>18</b>
+                                    <v>117</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21981,22 +22026,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>736</v>
+                                    <v>2491</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>122</v>
+                                    <v>1325</v>
                                 </b>
                                 <b>
-                                    <a>14</a>
-                                    <b>15</b>
-                                    <v>122</v>
-                                </b>
-                                <b>
-                                    <a>27</a>
-                                    <b>28</b>
-                                    <v>122</v>
+                                    <a>3</a>
+                                    <b>20</b>
+                                    <v>160</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22006,19 +22046,19 @@
         </relation>
         <relation>
             <name>template_template_argument</name>
-            <cardinality>9609</cardinality>
+            <cardinality>9794</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>6073</v>
+                    <v>6191</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>104</v>
+                    <v>106</v>
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>9021</v>
+                    <v>9196</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22032,22 +22072,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4982</v>
+                                    <v>5079</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>419</v>
+                                    <v>427</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>503</v>
+                                    <v>513</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>167</v>
+                                    <v>171</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22063,22 +22103,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5003</v>
+                                    <v>5100</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>555</v>
+                                    <v>566</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>10</b>
-                                    <v>461</v>
+                                    <v>470</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>52</v>
+                                    <v>53</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22216,12 +22256,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8990</v>
+                                    <v>9163</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>43</b>
-                                    <v>31</v>
+                                    <v>32</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22237,12 +22277,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9000</v>
+                                    <v>9174</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>11</b>
-                                    <v>20</v>
+                                    <v>21</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22252,7 +22292,7 @@
         </relation>
         <relation>
             <name>template_template_argument_value</name>
-            <cardinality>1104</cardinality>
+            <cardinality>1105</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
@@ -22264,7 +22304,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>1104</v>
+                    <v>1105</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22342,7 +22382,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1104</v>
+                                    <v>1105</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22358,7 +22398,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1104</v>
+                                    <v>1105</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22368,19 +22408,19 @@
         </relation>
         <relation>
             <name>concept_templates</name>
-            <cardinality>3592</cardinality>
+            <cardinality>3596</cardinality>
             <columnsizes>
                 <e>
                     <k>concept_id</k>
-                    <v>3592</v>
+                    <v>3596</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>3592</v>
+                    <v>3596</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>3592</v>
+                    <v>3596</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22394,7 +22434,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3592</v>
+                                    <v>3596</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22410,7 +22450,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3592</v>
+                                    <v>3596</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22426,7 +22466,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3592</v>
+                                    <v>3596</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22442,7 +22482,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3592</v>
+                                    <v>3596</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22458,7 +22498,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3592</v>
+                                    <v>3596</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22474,7 +22514,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3592</v>
+                                    <v>3596</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22484,15 +22524,15 @@
         </relation>
         <relation>
             <name>concept_instantiation</name>
-            <cardinality>90068</cardinality>
+            <cardinality>90176</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>90068</v>
+                    <v>90176</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>3421</v>
+                    <v>3425</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22506,7 +22546,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>90068</v>
+                                    <v>90176</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22527,7 +22567,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>106</v>
+                                    <v>107</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -22547,7 +22587,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>213</v>
+                                    <v>214</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -22557,17 +22597,17 @@
                                 <b>
                                     <a>10</a>
                                     <b>12</b>
-                                    <v>277</v>
+                                    <v>278</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>15</b>
-                                    <v>213</v>
+                                    <v>214</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>19</b>
-                                    <v>213</v>
+                                    <v>214</v>
                                 </b>
                                 <b>
                                     <a>19</a>
@@ -22592,7 +22632,7 @@
                                 <b>
                                     <a>79</a>
                                     <b>387</b>
-                                    <v>213</v>
+                                    <v>214</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22602,22 +22642,22 @@
         </relation>
         <relation>
             <name>is_type_constraint</name>
-            <cardinality>36673</cardinality>
+            <cardinality>36717</cardinality>
             <columnsizes>
                 <e>
                     <k>concept_id</k>
-                    <v>36673</v>
+                    <v>36717</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>concept_template_argument</name>
-            <cardinality>112649</cardinality>
+            <cardinality>112784</cardinality>
             <columnsizes>
                 <e>
                     <k>concept_id</k>
-                    <v>76104</v>
+                    <v>76196</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -22625,7 +22665,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>21490</v>
+                    <v>21516</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22639,17 +22679,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46295</v>
+                                    <v>46351</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>24612</v>
+                                    <v>24642</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>5196</v>
+                                    <v>5202</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22665,17 +22705,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>49888</v>
+                                    <v>49948</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>22324</v>
+                                    <v>22351</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>3891</v>
+                                    <v>3896</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22773,42 +22813,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10542</v>
+                                    <v>10554</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2908</v>
+                                    <v>2911</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1069</v>
+                                    <v>1070</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1347</v>
+                                    <v>1348</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>1133</v>
+                                    <v>1134</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>1625</v>
+                                    <v>1627</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>14</b>
-                                    <v>1945</v>
+                                    <v>1948</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>259</b>
-                                    <v>919</v>
+                                    <v>920</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22824,12 +22864,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18090</v>
+                                    <v>18112</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3271</v>
+                                    <v>3275</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -22844,19 +22884,19 @@
         </relation>
         <relation>
             <name>concept_template_argument_value</name>
-            <cardinality>104</cardinality>
+            <cardinality>105</cardinality>
             <columnsizes>
                 <e>
                     <k>concept_id</k>
-                    <v>82</v>
+                    <v>83</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>14</v>
+                    <v>15</v>
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>104</v>
+                    <v>105</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22870,7 +22910,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>82</v>
+                                    <v>83</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22886,7 +22926,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>59</v>
+                                    <v>60</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22949,7 +22989,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>104</v>
+                                    <v>105</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22965,7 +23005,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>104</v>
+                                    <v>105</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22975,15 +23015,15 @@
         </relation>
         <relation>
             <name>routinetypes</name>
-            <cardinality>595664</cardinality>
+            <cardinality>599125</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>595664</v>
+                    <v>599125</v>
                 </e>
                 <e>
                     <k>return_type</k>
-                    <v>279722</v>
+                    <v>281345</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22997,7 +23037,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>595664</v>
+                                    <v>599125</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23013,17 +23053,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>230679</v>
+                                    <v>232012</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>34709</v>
+                                    <v>34914</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>4677</b>
-                                    <v>14333</v>
+                                    <b>4676</b>
+                                    <v>14418</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23033,19 +23073,19 @@
         </relation>
         <relation>
             <name>routinetypeargs</name>
-            <cardinality>1178768</cardinality>
+            <cardinality>1178092</cardinality>
             <columnsizes>
                 <e>
                     <k>routine</k>
-                    <v>416090</v>
+                    <v>415851</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>980</v>
+                    <v>979</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>112097</v>
+                    <v>112033</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23059,32 +23099,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>82956</v>
+                                    <v>82909</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>126096</v>
+                                    <v>126023</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>107903</v>
+                                    <v>107841</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>49294</v>
+                                    <v>49266</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>33171</v>
+                                    <v>33152</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>19</b>
-                                    <v>16667</v>
+                                    <v>16658</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23100,27 +23140,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>88948</v>
+                                    <v>88897</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>138733</v>
+                                    <v>138653</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>114657</v>
+                                    <v>114591</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>40742</v>
+                                    <v>40719</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>10</b>
-                                    <v>32899</v>
+                                    <v>32880</v>
                                 </b>
                                 <b>
                                     <a>10</a>
@@ -23318,47 +23358,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33280</v>
+                                    <v>33261</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>15578</v>
+                                    <v>15569</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>13290</v>
+                                    <v>13282</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>9804</v>
+                                    <v>9798</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>6372</v>
+                                    <v>6369</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>9477</v>
+                                    <v>9472</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>13</b>
-                                    <v>9532</v>
+                                    <v>9526</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>26</b>
-                                    <v>8660</v>
+                                    <v>8655</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>926</b>
-                                    <v>6100</v>
+                                    <v>6097</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23374,22 +23414,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>79416</v>
+                                    <v>79370</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>17539</v>
+                                    <v>17529</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>9477</v>
+                                    <v>9472</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>17</b>
-                                    <v>5664</v>
+                                    <v>5661</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23399,19 +23439,19 @@
         </relation>
         <relation>
             <name>ptrtomembers</name>
-            <cardinality>9651</cardinality>
+            <cardinality>9837</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9651</v>
+                    <v>9837</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>7920</v>
+                    <v>8073</v>
                 </e>
                 <e>
                     <k>class_id</k>
-                    <v>4836</v>
+                    <v>4929</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23425,7 +23465,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9651</v>
+                                    <v>9837</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23441,7 +23481,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9651</v>
+                                    <v>9837</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23457,12 +23497,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7710</v>
+                                    <v>7859</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>84</b>
-                                    <v>209</v>
+                                    <v>213</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23478,12 +23518,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7710</v>
+                                    <v>7859</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>84</b>
-                                    <v>209</v>
+                                    <v>213</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23499,22 +23539,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3881</v>
+                                    <v>3956</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>514</v>
+                                    <v>523</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>398</v>
+                                    <v>406</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>65</b>
-                                    <v>41</v>
+                                    <v>42</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23530,22 +23570,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3881</v>
+                                    <v>3956</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>514</v>
+                                    <v>523</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>398</v>
+                                    <v>406</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>65</b>
-                                    <v>41</v>
+                                    <v>42</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23555,15 +23595,15 @@
         </relation>
         <relation>
             <name>specifiers</name>
-            <cardinality>7610</cardinality>
+            <cardinality>7612</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7610</v>
+                    <v>7612</v>
                 </e>
                 <e>
                     <k>str</k>
-                    <v>7610</v>
+                    <v>7612</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23577,7 +23617,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7610</v>
+                                    <v>7612</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23593,7 +23633,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7610</v>
+                                    <v>7612</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23603,15 +23643,15 @@
         </relation>
         <relation>
             <name>typespecifiers</name>
-            <cardinality>853570</cardinality>
+            <cardinality>868922</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>848462</v>
+                    <v>863725</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>94</v>
+                    <v>96</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23625,12 +23665,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>843353</v>
+                                    <v>858528</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5108</v>
+                                    <v>5196</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23664,8 +23704,8 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>821</a>
-                                    <b>822</b>
+                                    <a>820</a>
+                                    <b>821</b>
                                     <v>10</v>
                                 </b>
                                 <b>
@@ -23679,8 +23719,8 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>18435</a>
-                                    <b>18436</b>
+                                    <a>18328</a>
+                                    <b>18329</b>
                                     <v>10</v>
                                 </b>
                                 <b>
@@ -23696,11 +23736,11 @@
         </relation>
         <relation>
             <name>funspecifiers</name>
-            <cardinality>9569842</cardinality>
+            <cardinality>9572191</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>3954300</v>
+                    <v>3955783</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -23718,27 +23758,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1510375</v>
+                                    <v>1511321</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>500471</v>
+                                    <v>501195</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1019724</v>
+                                    <v>1019334</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>682148</v>
+                                    <v>682052</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>241581</v>
+                                    <v>241880</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23827,8 +23867,8 @@
                                     <v>122</v>
                                 </b>
                                 <b>
-                                    <a>6170</a>
-                                    <b>6171</b>
+                                    <a>6172</a>
+                                    <b>6173</b>
                                     <v>122</v>
                                 </b>
                                 <b>
@@ -23854,15 +23894,15 @@
         </relation>
         <relation>
             <name>varspecifiers</name>
-            <cardinality>3209301</cardinality>
+            <cardinality>3148493</cardinality>
             <columnsizes>
                 <e>
                     <k>var_id</k>
-                    <v>2456201</v>
+                    <v>2429115</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>1104</v>
+                    <v>1105</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23876,17 +23916,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1805109</v>
+                                    <v>1807839</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>549573</v>
+                                    <v>523664</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>101518</v>
+                                    <v>97611</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23905,8 +23945,8 @@
                                     <v>122</v>
                                 </b>
                                 <b>
-                                    <a>240</a>
-                                    <b>241</b>
+                                    <a>242</a>
+                                    <b>243</b>
                                     <v>122</v>
                                 </b>
                                 <b>
@@ -23920,28 +23960,28 @@
                                     <v>122</v>
                                 </b>
                                 <b>
-                                    <a>2749</a>
-                                    <b>2750</b>
+                                    <a>2566</a>
+                                    <b>2567</b>
                                     <v>122</v>
                                 </b>
                                 <b>
-                                    <a>2812</a>
-                                    <b>2813</b>
+                                    <a>2749</a>
+                                    <b>2750</b>
                                     <v>122</v>
                                 </b>
                                 <b>
-                                    <a>3506</a>
-                                    <b>3507</b>
+                                    <a>3255</a>
+                                    <b>3256</b>
                                     <v>122</v>
                                 </b>
                                 <b>
-                                    <a>4918</a>
-                                    <b>4919</b>
+                                    <a>4944</a>
+                                    <b>4945</b>
                                     <v>122</v>
                                 </b>
                                 <b>
-                                    <a>8493</a>
-                                    <b>8494</b>
+                                    <a>8461</a>
+                                    <b>8462</b>
                                     <v>122</v>
                                 </b>
                             </bs>
@@ -23952,15 +23992,15 @@
         </relation>
         <relation>
             <name>explicit_specifier_exprs</name>
-            <cardinality>40631</cardinality>
+            <cardinality>40640</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>40631</v>
+                    <v>40640</v>
                 </e>
                 <e>
                     <k>constant</k>
-                    <v>40631</v>
+                    <v>40640</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23974,7 +24014,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40631</v>
+                                    <v>40640</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23990,7 +24030,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40631</v>
+                                    <v>40640</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24000,11 +24040,11 @@
         </relation>
         <relation>
             <name>attributes</name>
-            <cardinality>643971</cardinality>
+            <cardinality>644113</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>643971</v>
+                    <v>644113</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -24012,7 +24052,7 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>2086</v>
+                    <v>2087</v>
                 </e>
                 <e>
                     <k>name_space</k>
@@ -24020,7 +24060,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>637956</v>
+                    <v>638096</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24034,7 +24074,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>643971</v>
+                                    <v>644113</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24050,7 +24090,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>643971</v>
+                                    <v>644113</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24066,7 +24106,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>643971</v>
+                                    <v>644113</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24082,7 +24122,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>643971</v>
+                                    <v>644113</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24299,7 +24339,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2086</v>
+                                    <v>2087</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24485,12 +24525,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>632187</v>
+                                    <v>632326</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>5769</v>
+                                    <v>5770</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24506,7 +24546,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>637956</v>
+                                    <v>638096</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24522,12 +24562,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>632923</v>
+                                    <v>633062</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5032</v>
+                                    <v>5034</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24543,7 +24583,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>637956</v>
+                                    <v>638096</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24553,11 +24593,11 @@
         </relation>
         <relation>
             <name>attribute_args</name>
-            <cardinality>82169</cardinality>
+            <cardinality>82122</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>82169</v>
+                    <v>82122</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -24565,7 +24605,7 @@
                 </e>
                 <e>
                     <k>attribute</k>
-                    <v>70920</v>
+                    <v>70879</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -24573,7 +24613,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>56912</v>
+                    <v>56879</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24587,7 +24627,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>82169</v>
+                                    <v>82122</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24603,7 +24643,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>82169</v>
+                                    <v>82122</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24619,7 +24659,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>82169</v>
+                                    <v>82122</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24635,7 +24675,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>82169</v>
+                                    <v>82122</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24755,12 +24795,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>65477</v>
+                                    <v>65439</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>5322</v>
+                                    <v>5318</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -24781,12 +24821,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>69411</v>
+                                    <v>69371</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1509</v>
+                                    <v>1508</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24802,12 +24842,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>67890</v>
+                                    <v>67851</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>3029</v>
+                                    <v>3027</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24823,12 +24863,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>68420</v>
+                                    <v>68381</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>2499</v>
+                                    <v>2498</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25008,17 +25048,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>41309</v>
+                                    <v>41285</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>11801</v>
+                                    <v>11795</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>25</b>
-                                    <v>3801</v>
+                                    <v>3799</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25034,12 +25074,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>47426</v>
+                                    <v>47398</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9486</v>
+                                    <v>9480</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25055,17 +25095,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>42656</v>
+                                    <v>42632</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12239</v>
+                                    <v>12232</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>11</b>
-                                    <v>2015</v>
+                                    <v>2014</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25081,7 +25121,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>56664</v>
+                                    <v>56632</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25096,15 +25136,15 @@
         </relation>
         <relation>
             <name>attribute_arg_value</name>
-            <cardinality>16448</cardinality>
+            <cardinality>16545</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>16448</v>
+                    <v>16545</v>
                 </e>
                 <e>
                     <k>value</k>
-                    <v>503</v>
+                    <v>506</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25118,7 +25158,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16448</v>
+                                    <v>16545</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25134,7 +25174,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>201</v>
+                                    <v>202</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -25189,11 +25229,11 @@
         </relation>
         <relation>
             <name>attribute_arg_type</name>
-            <cardinality>460</cardinality>
+            <cardinality>464</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>460</v>
+                    <v>464</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -25211,7 +25251,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>460</v>
+                                    <v>464</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25252,15 +25292,15 @@
         </relation>
         <relation>
             <name>attribute_arg_constant</name>
-            <cardinality>71688</cardinality>
+            <cardinality>72691</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>71688</v>
+                    <v>72691</v>
                 </e>
                 <e>
                     <k>constant</k>
-                    <v>71688</v>
+                    <v>72691</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25274,7 +25314,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>71688</v>
+                                    <v>72691</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25290,7 +25330,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>71688</v>
+                                    <v>72691</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25300,15 +25340,15 @@
         </relation>
         <relation>
             <name>attribute_arg_expr</name>
-            <cardinality>1582</cardinality>
+            <cardinality>1584</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>1582</v>
+                    <v>1584</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>1582</v>
+                    <v>1584</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25322,7 +25362,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1582</v>
+                                    <v>1584</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25338,7 +25378,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1582</v>
+                                    <v>1584</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25401,15 +25441,15 @@
         </relation>
         <relation>
             <name>typeattributes</name>
-            <cardinality>94766</cardinality>
+            <cardinality>94787</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>93048</v>
+                    <v>93068</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>31916</v>
+                    <v>31923</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25423,7 +25463,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>91329</v>
+                                    <v>91349</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25444,7 +25484,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27497</v>
+                                    <v>27503</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25464,15 +25504,15 @@
         </relation>
         <relation>
             <name>funcattributes</name>
-            <cardinality>834364</cardinality>
+            <cardinality>834547</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>788699</v>
+                    <v>788873</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>607513</v>
+                    <v>607647</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25486,12 +25526,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>747454</v>
+                                    <v>747618</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>41245</v>
+                                    <v>41254</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25507,12 +25547,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>561234</v>
+                                    <v>561358</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>45</b>
-                                    <v>45787</v>
+                                    <v>45797</v>
                                 </b>
                                 <b>
                                     <a>55</a>
@@ -25590,15 +25630,15 @@
         </relation>
         <relation>
             <name>namespaceattributes</name>
-            <cardinality>5907</cardinality>
+            <cardinality>5942</cardinality>
             <columnsizes>
                 <e>
                     <k>namespace_id</k>
-                    <v>134</v>
+                    <v>135</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>5907</v>
+                    <v>5942</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25638,7 +25678,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5907</v>
+                                    <v>5942</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25648,15 +25688,15 @@
         </relation>
         <relation>
             <name>stmtattributes</name>
-            <cardinality>2223</cardinality>
+            <cardinality>2226</cardinality>
             <columnsizes>
                 <e>
                     <k>stmt_id</k>
-                    <v>2223</v>
+                    <v>2226</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>577</v>
+                    <v>578</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25670,7 +25710,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2223</v>
+                                    <v>2226</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25701,7 +25741,7 @@
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>106</v>
+                                    <v>107</v>
                                 </b>
                                 <b>
                                     <a>13</a>
@@ -25716,15 +25756,15 @@
         </relation>
         <relation>
             <name>unspecifiedtype</name>
-            <cardinality>7371180</cardinality>
+            <cardinality>7365434</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>7371180</v>
+                    <v>7365434</v>
                 </e>
                 <e>
                     <k>unspecified_type_id</k>
-                    <v>4135732</v>
+                    <v>4133203</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25738,7 +25778,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7371180</v>
+                                    <v>7365434</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25754,22 +25794,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2670039</v>
+                                    <v>2667188</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1104793</v>
+                                    <v>1105036</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>311674</v>
+                                    <v>311742</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>895</b>
-                                    <v>49224</v>
+                                    <v>49235</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25779,19 +25819,19 @@
         </relation>
         <relation>
             <name>member</name>
-            <cardinality>4123947</cardinality>
+            <cardinality>4121662</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>534719</v>
+                    <v>532872</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>29215</v>
+                    <v>29222</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>4119405</v>
+                    <v>4117119</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25805,57 +25845,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>127419</v>
+                                    <v>126710</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>81754</v>
+                                    <v>80544</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>31916</v>
+                                    <v>31923</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>44191</v>
+                                    <v>44201</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>41613</v>
+                                    <v>41623</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>33389</v>
+                                    <v>33396</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>41613</v>
+                                    <v>41623</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>13</b>
-                                    <v>40509</v>
+                                    <v>40517</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>18</b>
-                                    <v>40631</v>
+                                    <v>40640</v>
                                 </b>
                                 <b>
                                     <a>18</a>
-                                    <b>42</b>
-                                    <v>40140</v>
+                                    <b>41</b>
+                                    <v>40026</v>
                                 </b>
                                 <b>
-                                    <a>42</a>
+                                    <a>41</a>
                                     <b>239</b>
-                                    <v>11538</v>
+                                    <v>11664</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25871,57 +25911,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>127173</v>
+                                    <v>126465</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>81877</v>
+                                    <v>80667</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>31670</v>
+                                    <v>31677</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>44437</v>
+                                    <v>44447</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>41613</v>
+                                    <v>41623</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>32284</v>
+                                    <v>32291</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>41982</v>
+                                    <v>41991</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>13</b>
-                                    <v>40877</v>
+                                    <v>40886</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>18</b>
-                                    <v>40754</v>
+                                    <v>40763</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>42</b>
-                                    <v>40140</v>
+                                    <v>40149</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>265</b>
-                                    <v>11907</v>
+                                    <v>11909</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25937,12 +25977,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6383</v>
+                                    <v>6384</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2577</v>
+                                    <v>2578</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -25957,12 +25997,12 @@
                                 <b>
                                     <a>10</a>
                                     <b>19</b>
-                                    <v>2209</v>
+                                    <v>2210</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>26</b>
-                                    <v>2209</v>
+                                    <v>2210</v>
                                 </b>
                                 <b>
                                     <a>26</a>
@@ -25972,22 +26012,22 @@
                                 <b>
                                     <a>36</a>
                                     <b>50</b>
-                                    <v>2209</v>
+                                    <v>2210</v>
                                 </b>
                                 <b>
                                     <a>54</a>
                                     <b>141</b>
-                                    <v>2209</v>
+                                    <v>2210</v>
                                 </b>
                                 <b>
                                     <a>150</a>
                                     <b>468</b>
-                                    <v>2209</v>
+                                    <v>2210</v>
                                 </b>
                                 <b>
                                     <a>480</a>
-                                    <b>4311</b>
-                                    <v>2086</v>
+                                    <b>4295</b>
+                                    <v>2087</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26003,12 +26043,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5401</v>
+                                    <v>5402</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3559</v>
+                                    <v>3560</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -26023,17 +26063,17 @@
                                 <b>
                                     <a>10</a>
                                     <b>20</b>
-                                    <v>2209</v>
+                                    <v>2210</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>27</b>
-                                    <v>2209</v>
+                                    <v>2210</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>37</b>
-                                    <v>2577</v>
+                                    <v>2578</v>
                                 </b>
                                 <b>
                                     <a>37</a>
@@ -26043,16 +26083,16 @@
                                 <b>
                                     <a>58</a>
                                     <b>155</b>
-                                    <v>2209</v>
+                                    <v>2210</v>
                                 </b>
                                 <b>
                                     <a>164</a>
                                     <b>528</b>
-                                    <v>2209</v>
+                                    <v>2210</v>
                                 </b>
                                 <b>
                                     <a>548</a>
-                                    <b>4332</b>
+                                    <b>4316</b>
                                     <v>1841</v>
                                 </b>
                             </bs>
@@ -26069,7 +26109,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4119405</v>
+                                    <v>4117119</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26085,12 +26125,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4114864</v>
+                                    <v>4112576</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4541</v>
+                                    <v>4542</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26100,15 +26140,15 @@
         </relation>
         <relation>
             <name>enclosingfunction</name>
-            <cardinality>114616</cardinality>
+            <cardinality>116832</cardinality>
             <columnsizes>
                 <e>
                     <k>child</k>
-                    <v>114616</v>
+                    <v>116832</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>68858</v>
+                    <v>70189</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26122,7 +26162,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>114616</v>
+                                    <v>116832</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26138,22 +26178,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37324</v>
+                                    <v>38046</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>24410</v>
+                                    <v>24882</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>6042</v>
+                                    <v>6159</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>45</b>
-                                    <v>1080</v>
+                                    <v>1101</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26163,27 +26203,27 @@
         </relation>
         <relation>
             <name>derivations</name>
-            <cardinality>492610</cardinality>
+            <cardinality>494887</cardinality>
             <columnsizes>
                 <e>
                     <k>derivation</k>
-                    <v>492610</v>
+                    <v>494887</v>
                 </e>
                 <e>
                     <k>sub</k>
-                    <v>471194</v>
+                    <v>473343</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>234</v>
+                    <v>236</v>
                 </e>
                 <e>
                     <k>super</k>
-                    <v>239877</v>
+                    <v>240926</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>34877</v>
+                    <v>35083</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26197,7 +26237,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>492610</v>
+                                    <v>494887</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26213,7 +26253,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>492610</v>
+                                    <v>494887</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26229,7 +26269,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>492610</v>
+                                    <v>494887</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26245,7 +26285,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>492610</v>
+                                    <v>494887</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26261,12 +26301,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>454914</v>
+                                    <v>456966</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>9</b>
-                                    <v>16280</v>
+                                    <v>16376</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26282,12 +26322,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>454914</v>
+                                    <v>456966</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>16280</v>
+                                    <v>16376</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26303,12 +26343,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>454914</v>
+                                    <v>456966</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>9</b>
-                                    <v>16280</v>
+                                    <v>16376</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26324,12 +26364,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>454914</v>
+                                    <v>456966</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>16280</v>
+                                    <v>16376</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26345,7 +26385,7 @@
                                 <b>
                                     <a>25</a>
                                     <b>26</b>
-                                    <v>100</v>
+                                    <v>101</v>
                                 </b>
                                 <b>
                                     <a>26</a>
@@ -26363,8 +26403,8 @@
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>14037</a>
-                                    <b>14038</b>
+                                    <a>14018</a>
+                                    <b>14019</b>
                                     <v>33</v>
                                 </b>
                             </bs>
@@ -26381,7 +26421,7 @@
                                 <b>
                                     <a>25</a>
                                     <b>26</b>
-                                    <v>134</v>
+                                    <v>135</v>
                                 </b>
                                 <b>
                                     <a>52</a>
@@ -26394,8 +26434,8 @@
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>14037</a>
-                                    <b>14038</b>
+                                    <a>14018</a>
+                                    <b>14019</b>
                                     <v>33</v>
                                 </b>
                             </bs>
@@ -26435,8 +26475,8 @@
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>6742</a>
-                                    <b>6743</b>
+                                    <a>6731</a>
+                                    <b>6732</b>
                                     <v>33</v>
                                 </b>
                             </bs>
@@ -26453,7 +26493,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>134</v>
+                                    <v>135</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -26484,12 +26524,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>230108</v>
+                                    <v>231269</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1758</b>
-                                    <v>9768</v>
+                                    <v>9657</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26505,12 +26545,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>230108</v>
+                                    <v>231269</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1758</b>
-                                    <v>9768</v>
+                                    <v>9657</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26526,12 +26566,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>239440</v>
+                                    <v>240487</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>436</v>
+                                    <v>438</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26547,12 +26587,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>234506</v>
+                                    <v>235658</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>81</b>
-                                    <v>5370</v>
+                                    <v>5267</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26568,27 +26608,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25847</v>
+                                    <v>26000</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>5</b>
-                                    <v>3188</v>
+                                    <b>4</b>
+                                    <v>2498</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>21</b>
-                                    <v>2618</v>
+                                    <a>4</a>
+                                    <b>12</b>
+                                    <v>2633</v>
                                 </b>
                                 <b>
-                                    <a>21</a>
-                                    <b>186</b>
-                                    <v>2618</v>
+                                    <a>13</a>
+                                    <b>85</b>
+                                    <v>2633</v>
                                 </b>
                                 <b>
-                                    <a>205</a>
+                                    <a>87</a>
                                     <b>985</b>
-                                    <v>604</v>
+                                    <v>1316</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26604,27 +26644,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25847</v>
+                                    <v>26000</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>5</b>
-                                    <v>3188</v>
+                                    <b>4</b>
+                                    <v>2498</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>21</b>
-                                    <v>2618</v>
+                                    <a>4</a>
+                                    <b>12</b>
+                                    <v>2633</v>
                                 </b>
                                 <b>
-                                    <a>21</a>
-                                    <b>186</b>
-                                    <v>2618</v>
+                                    <a>13</a>
+                                    <b>85</b>
+                                    <v>2633</v>
                                 </b>
                                 <b>
-                                    <a>205</a>
+                                    <a>87</a>
                                     <b>985</b>
-                                    <v>604</v>
+                                    <v>1316</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26640,7 +26680,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>34877</v>
+                                    <v>35083</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26656,22 +26696,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28163</v>
+                                    <v>28330</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>2551</v>
+                                    <v>2600</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>24</b>
-                                    <v>2651</v>
+                                    <v>2633</v>
                                 </b>
                                 <b>
                                     <a>24</a>
                                     <b>933</b>
-                                    <v>1510</v>
+                                    <v>1519</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26681,15 +26721,15 @@
         </relation>
         <relation>
             <name>derspecifiers</name>
-            <cardinality>494356</cardinality>
+            <cardinality>496643</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>492174</v>
+                    <v>494448</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>134</v>
+                    <v>135</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26703,12 +26743,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>489992</v>
+                                    <v>492253</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2181</v>
+                                    <v>2194</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26737,8 +26777,8 @@
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>13466</a>
-                                    <b>13467</b>
+                                    <a>13447</a>
+                                    <b>13448</b>
                                     <v>33</v>
                                 </b>
                             </bs>
@@ -26749,15 +26789,15 @@
         </relation>
         <relation>
             <name>direct_base_offsets</name>
-            <cardinality>466092</cardinality>
+            <cardinality>468211</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>466092</v>
+                    <v>468211</v>
                 </e>
                 <e>
                     <k>offset</k>
-                    <v>503</v>
+                    <v>506</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26771,7 +26811,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>466092</v>
+                                    <v>468211</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26787,17 +26827,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>100</v>
+                                    <v>101</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>134</v>
+                                    <v>135</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>100</v>
+                                    <v>101</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -26820,8 +26860,8 @@
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>13735</a>
-                                    <b>13736</b>
+                                    <a>13716</a>
+                                    <b>13717</b>
                                     <v>33</v>
                                 </b>
                             </bs>
@@ -26832,19 +26872,19 @@
         </relation>
         <relation>
             <name>virtual_base_offsets</name>
-            <cardinality>5740</cardinality>
+            <cardinality>5774</cardinality>
             <columnsizes>
                 <e>
                     <k>sub</k>
-                    <v>5740</v>
+                    <v>5774</v>
                 </e>
                 <e>
                     <k>super</k>
-                    <v>100</v>
+                    <v>101</v>
                 </e>
                 <e>
                     <k>offset</k>
-                    <v>335</v>
+                    <v>337</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26858,7 +26898,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5740</v>
+                                    <v>5774</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26874,7 +26914,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5740</v>
+                                    <v>5774</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26932,7 +26972,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>302</v>
+                                    <v>303</v>
                                 </b>
                                 <b>
                                     <a>153</a>
@@ -26958,7 +26998,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>302</v>
+                                    <v>303</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26968,23 +27008,23 @@
         </relation>
         <relation>
             <name>frienddecls</name>
-            <cardinality>761457</cardinality>
+            <cardinality>765587</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>761457</v>
+                    <v>765587</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>53910</v>
+                    <v>54229</v>
                 </e>
                 <e>
                     <k>decl_id</k>
-                    <v>99898</v>
+                    <v>100489</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>6008</v>
+                    <v>6044</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26998,7 +27038,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>761457</v>
+                                    <v>765587</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27014,7 +27054,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>761457</v>
+                                    <v>765587</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27030,7 +27070,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>761457</v>
+                                    <v>765587</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27046,42 +27086,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5538</v>
+                                    <v>5571</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>24806</v>
+                                    <v>24953</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>4733</v>
+                                    <v>4794</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>17</b>
-                                    <v>4699</v>
+                                    <v>4693</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>27</b>
-                                    <v>4430</v>
+                                    <v>4457</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>45</b>
-                                    <v>4263</v>
+                                    <v>4288</v>
                                 </b>
                                 <b>
                                     <a>45</a>
                                     <b>81</b>
-                                    <v>4699</v>
+                                    <v>4727</v>
                                 </b>
                                 <b>
                                     <a>102</a>
                                     <b>121</b>
-                                    <v>738</v>
+                                    <v>742</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27097,42 +27137,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5538</v>
+                                    <v>5571</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>24806</v>
+                                    <v>24953</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>4733</v>
+                                    <v>4794</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>17</b>
-                                    <v>4699</v>
+                                    <v>4693</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>27</b>
-                                    <v>4430</v>
+                                    <v>4457</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>45</b>
-                                    <v>4263</v>
+                                    <v>4288</v>
                                 </b>
                                 <b>
                                     <a>45</a>
                                     <b>81</b>
-                                    <v>4699</v>
+                                    <v>4727</v>
                                 </b>
                                 <b>
                                     <a>102</a>
                                     <b>121</b>
-                                    <v>738</v>
+                                    <v>742</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27148,12 +27188,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52567</v>
+                                    <v>52878</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>13</b>
-                                    <v>1342</v>
+                                    <v>1350</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27169,32 +27209,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>66968</v>
+                                    <v>67431</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8056</v>
+                                    <v>7968</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>9130</v>
+                                    <v>9252</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>24</b>
-                                    <v>7552</v>
+                                    <v>7597</v>
                                 </b>
                                 <b>
                                     <a>24</a>
-                                    <b>136</b>
-                                    <v>7586</v>
+                                    <b>135</b>
+                                    <v>7597</v>
                                 </b>
                                 <b>
-                                    <a>136</a>
+                                    <a>135</a>
                                     <b>191</b>
-                                    <v>604</v>
+                                    <v>641</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27210,32 +27250,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>66968</v>
+                                    <v>67431</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8056</v>
+                                    <v>7968</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>9130</v>
+                                    <v>9252</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>24</b>
-                                    <v>7552</v>
+                                    <v>7597</v>
                                 </b>
                                 <b>
                                     <a>24</a>
-                                    <b>136</b>
-                                    <v>7586</v>
+                                    <b>135</b>
+                                    <v>7597</v>
                                 </b>
                                 <b>
-                                    <a>136</a>
+                                    <a>135</a>
                                     <b>191</b>
-                                    <v>604</v>
+                                    <v>641</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27251,12 +27291,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>98690</v>
+                                    <v>99273</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>1208</v>
+                                    <v>1215</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27272,12 +27312,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5639</v>
+                                    <v>5672</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>22495</b>
-                                    <v>369</v>
+                                    <b>22484</b>
+                                    <v>371</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27293,12 +27333,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5874</v>
+                                    <v>5909</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1509</b>
-                                    <v>134</v>
+                                    <v>135</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27314,12 +27354,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5672</v>
+                                    <v>5706</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>2844</b>
-                                    <v>335</v>
+                                    <v>337</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27329,19 +27369,19 @@
         </relation>
         <relation>
             <name>comments</name>
-            <cardinality>11056034</cardinality>
+            <cardinality>11058465</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>11056034</v>
+                    <v>11058465</v>
                 </e>
                 <e>
                     <k>contents</k>
-                    <v>4236514</v>
+                    <v>4237445</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>11056034</v>
+                    <v>11058465</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27355,7 +27395,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11056034</v>
+                                    <v>11058465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27371,7 +27411,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11056034</v>
+                                    <v>11058465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27387,17 +27427,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3867144</v>
+                                    <v>3867994</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>318425</v>
+                                    <v>318495</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>34447</b>
-                                    <v>50943</v>
+                                    <v>50954</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27413,17 +27453,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3867144</v>
+                                    <v>3867994</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>318425</v>
+                                    <v>318495</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>34447</b>
-                                    <v>50943</v>
+                                    <v>50954</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27439,7 +27479,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11056034</v>
+                                    <v>11058465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27455,7 +27495,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11056034</v>
+                                    <v>11058465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27465,15 +27505,15 @@
         </relation>
         <relation>
             <name>commentbinding</name>
-            <cardinality>3852168</cardinality>
+            <cardinality>3860014</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3297194</v>
+                    <v>3297919</v>
                 </e>
                 <e>
                     <k>element</k>
-                    <v>3689273</v>
+                    <v>3697082</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27487,12 +27527,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3236553</v>
+                                    <v>3230266</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1706</b>
-                                    <v>60640</v>
+                                    <v>67652</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27508,12 +27548,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3526377</v>
+                                    <v>3534151</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>162895</v>
+                                    <v>162931</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27523,15 +27563,15 @@
         </relation>
         <relation>
             <name>exprconv</name>
-            <cardinality>9635850</cardinality>
+            <cardinality>9630323</cardinality>
             <columnsizes>
                 <e>
                     <k>converted</k>
-                    <v>9635744</v>
+                    <v>9630218</v>
                 </e>
                 <e>
                     <k>conversion</k>
-                    <v>9635850</v>
+                    <v>9630323</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27545,7 +27585,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9635639</v>
+                                    <v>9630112</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27566,7 +27606,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9635850</v>
+                                    <v>9630323</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27576,30 +27616,30 @@
         </relation>
         <relation>
             <name>compgenerated</name>
-            <cardinality>9880588</cardinality>
+            <cardinality>9856495</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9880588</v>
+                    <v>9856495</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>synthetic_destructor_call</name>
-            <cardinality>1661391</cardinality>
+            <cardinality>1663253</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
-                    <v>1237286</v>
+                    <v>1238704</v>
                 </e>
                 <e>
                     <k>i</k>
-                    <v>384</v>
+                    <v>385</v>
                 </e>
                 <e>
                     <k>destructor_call</k>
-                    <v>1661391</v>
+                    <v>1663253</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27613,17 +27653,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>823574</v>
+                                    <v>824561</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>406954</v>
+                                    <v>407377</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>19</b>
-                                    <v>6757</v>
+                                    <v>6765</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27639,17 +27679,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>823574</v>
+                                    <v>824561</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>406954</v>
+                                    <v>407377</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>19</b>
-                                    <v>6757</v>
+                                    <v>6765</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27708,13 +27748,13 @@
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>19347</a>
-                                    <b>19348</b>
+                                    <a>19344</a>
+                                    <b>19345</b>
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>57861</a>
-                                    <b>57862</b>
+                                    <a>57858</a>
+                                    <b>57859</b>
                                     <v>21</v>
                                 </b>
                             </bs>
@@ -27774,13 +27814,13 @@
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>19347</a>
-                                    <b>19348</b>
+                                    <a>19344</a>
+                                    <b>19345</b>
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>57861</a>
-                                    <b>57862</b>
+                                    <a>57858</a>
+                                    <b>57859</b>
                                     <v>21</v>
                                 </b>
                             </bs>
@@ -27797,7 +27837,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1661391</v>
+                                    <v>1663253</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27813,7 +27853,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1661391</v>
+                                    <v>1663253</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27823,15 +27863,15 @@
         </relation>
         <relation>
             <name>namespaces</name>
-            <cardinality>8591</cardinality>
+            <cardinality>8757</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>8591</v>
+                    <v>8757</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>4542</v>
+                    <v>4630</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27845,7 +27885,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8591</v>
+                                    <v>8757</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27861,17 +27901,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3713</v>
+                                    <v>3785</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>524</v>
+                                    <v>534</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>149</b>
-                                    <v>304</v>
+                                    <v>310</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27892,15 +27932,15 @@
         </relation>
         <relation>
             <name>namespacembrs</name>
-            <cardinality>2487871</cardinality>
+            <cardinality>2457354</cardinality>
             <columnsizes>
                 <e>
                     <k>parentid</k>
-                    <v>3928</v>
+                    <v>3929</v>
                 </e>
                 <e>
                     <k>memberid</k>
-                    <v>2487871</v>
+                    <v>2457354</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27972,8 +28012,8 @@
                                     <v>245</v>
                                 </b>
                                 <b>
-                                    <a>19521</a>
-                                    <b>19522</b>
+                                    <a>19268</a>
+                                    <b>19269</b>
                                     <v>122</v>
                                 </b>
                             </bs>
@@ -27990,7 +28030,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2487871</v>
+                                    <v>2457354</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28000,19 +28040,19 @@
         </relation>
         <relation>
             <name>exprparents</name>
-            <cardinality>19459867</cardinality>
+            <cardinality>19448700</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>19459867</v>
+                    <v>19448700</v>
                 </e>
                 <e>
                     <k>child_index</k>
-                    <v>20040</v>
+                    <v>20029</v>
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>12943755</v>
+                    <v>12936328</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28026,7 +28066,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19459867</v>
+                                    <v>19448700</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28042,7 +28082,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19459867</v>
+                                    <v>19448700</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28058,7 +28098,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3856</v>
+                                    <v>3853</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28073,17 +28113,17 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>8978</v>
+                                    <v>8973</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>1660</v>
+                                    <v>1659</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>1632</v>
+                                    <v>1631</v>
                                 </b>
                                 <b>
                                     <a>11</a>
@@ -28109,7 +28149,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3856</v>
+                                    <v>3853</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28124,17 +28164,17 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>8978</v>
+                                    <v>8973</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>1660</v>
+                                    <v>1659</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>1632</v>
+                                    <v>1631</v>
                                 </b>
                                 <b>
                                     <a>11</a>
@@ -28160,17 +28200,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7396922</v>
+                                    <v>7392678</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5084149</v>
+                                    <v>5081231</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>712</b>
-                                    <v>462684</v>
+                                    <v>462418</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28186,17 +28226,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7396922</v>
+                                    <v>7392678</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5084149</v>
+                                    <v>5081231</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>712</b>
-                                    <v>462684</v>
+                                    <v>462418</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28206,22 +28246,22 @@
         </relation>
         <relation>
             <name>expr_isload</name>
-            <cardinality>6902994</cardinality>
+            <cardinality>6890637</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>6902994</v>
+                    <v>6890637</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>conversionkinds</name>
-            <cardinality>6052094</cardinality>
+            <cardinality>6047233</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>6052094</v>
+                    <v>6047233</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -28239,7 +28279,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6052094</v>
+                                    <v>6047233</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28268,8 +28308,8 @@
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>40990</a>
-                                    <b>40991</b>
+                                    <a>40996</a>
+                                    <b>40997</b>
                                     <v>1</v>
                                 </b>
                                 <b>
@@ -28278,13 +28318,13 @@
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>92949</a>
-                                    <b>92950</b>
+                                    <a>92848</a>
+                                    <b>92849</b>
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>5833488</a>
-                                    <b>5833489</b>
+                                    <a>5828722</a>
+                                    <b>5828723</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -28295,11 +28335,11 @@
         </relation>
         <relation>
             <name>iscall</name>
-            <cardinality>5772743</cardinality>
+            <cardinality>5777667</cardinality>
             <columnsizes>
                 <e>
                     <k>caller</k>
-                    <v>5772743</v>
+                    <v>5777667</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -28317,7 +28357,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5772743</v>
+                                    <v>5777667</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28341,8 +28381,8 @@
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>268245</a>
-                                    <b>268246</b>
+                                    <a>268152</a>
+                                    <b>268153</b>
                                     <v>21</v>
                                 </b>
                             </bs>
@@ -28353,11 +28393,11 @@
         </relation>
         <relation>
             <name>numtemplatearguments</name>
-            <cardinality>729040</cardinality>
+            <cardinality>684876</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>729040</v>
+                    <v>684876</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -28375,7 +28415,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>729040</v>
+                                    <v>684876</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28399,8 +28439,8 @@
                                     <v>122</v>
                                 </b>
                                 <b>
-                                    <a>27</a>
-                                    <b>28</b>
+                                    <a>22</a>
+                                    <b>23</b>
                                     <v>122</v>
                                 </b>
                                 <b>
@@ -28409,8 +28449,8 @@
                                     <v>122</v>
                                 </b>
                                 <b>
-                                    <a>68</a>
-                                    <b>69</b>
+                                    <a>62</a>
+                                    <b>63</b>
                                     <v>122</v>
                                 </b>
                                 <b>
@@ -28419,13 +28459,13 @@
                                     <v>122</v>
                                 </b>
                                 <b>
-                                    <a>2001</a>
-                                    <b>2002</b>
+                                    <a>1843</a>
+                                    <b>1844</b>
                                     <v>122</v>
                                 </b>
                                 <b>
-                                    <a>3393</a>
-                                    <b>3394</b>
+                                    <a>3201</a>
+                                    <b>3202</b>
                                     <v>122</v>
                                 </b>
                             </bs>
@@ -28484,23 +28524,23 @@
         </relation>
         <relation>
             <name>namequalifiers</name>
-            <cardinality>3050545</cardinality>
+            <cardinality>3044887</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3050545</v>
+                    <v>3044887</v>
                 </e>
                 <e>
                     <k>qualifiableelement</k>
-                    <v>3050545</v>
+                    <v>3044887</v>
                 </e>
                 <e>
                     <k>qualifyingelement</k>
-                    <v>54656</v>
+                    <v>54379</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>558950</v>
+                    <v>557008</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28514,7 +28554,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3050545</v>
+                                    <v>3044887</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28530,7 +28570,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3050545</v>
+                                    <v>3044887</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28546,7 +28586,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3050545</v>
+                                    <v>3044887</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28562,7 +28602,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3050545</v>
+                                    <v>3044887</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28578,7 +28618,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3050545</v>
+                                    <v>3044887</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28594,7 +28634,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3050545</v>
+                                    <v>3044887</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28610,27 +28650,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37913</v>
+                                    <v>37916</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8382</v>
+                                    <v>8435</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>4127</v>
+                                    <v>4132</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>476</b>
-                                    <v>4105</v>
-                                </b>
-                                <b>
-                                    <a>1600</a>
                                     <b>41956</b>
-                                    <v>128</v>
+                                    <v>3896</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28646,27 +28681,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37913</v>
+                                    <v>37916</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8382</v>
+                                    <v>8435</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>4127</v>
+                                    <v>4132</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>476</b>
-                                    <v>4105</v>
-                                </b>
-                                <b>
-                                    <a>1600</a>
                                     <b>41956</b>
-                                    <v>128</v>
+                                    <v>3896</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28682,22 +28712,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>41441</v>
+                                    <v>41234</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7420</v>
+                                    <v>7407</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>4148</v>
+                                    <v>4132</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>20059</b>
-                                    <v>1646</v>
+                                    <v>1605</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28713,22 +28743,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>83311</v>
+                                    <v>84417</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>42339</v>
+                                    <v>39007</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>396669</v>
+                                    <v>397208</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>192</b>
-                                    <v>36630</v>
+                                    <v>36374</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28744,22 +28774,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>83311</v>
+                                    <v>84417</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>42339</v>
+                                    <v>39007</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>396669</v>
+                                    <v>397208</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>192</b>
-                                    <v>36630</v>
+                                    <v>36374</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28775,22 +28805,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>119492</v>
+                                    <v>117045</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>14070</v>
+                                    <v>14065</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>412920</v>
+                                    <v>413479</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>60</b>
-                                    <v>12466</v>
+                                    <v>12417</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28800,15 +28830,15 @@
         </relation>
         <relation>
             <name>varbind</name>
-            <cardinality>8257017</cardinality>
+            <cardinality>8252279</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>8257017</v>
+                    <v>8252279</v>
                 </e>
                 <e>
                     <k>var</k>
-                    <v>1050679</v>
+                    <v>1050076</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28822,7 +28852,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8257017</v>
+                                    <v>8252279</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28838,52 +28868,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>171585</v>
+                                    <v>171487</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>188755</v>
+                                    <v>188646</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>145690</v>
+                                    <v>145606</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>116670</v>
+                                    <v>116603</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>83175</v>
+                                    <v>83127</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>65836</v>
+                                    <v>65798</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>80838</v>
+                                    <v>80792</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>13</b>
-                                    <v>81598</v>
+                                    <v>81551</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>27</b>
-                                    <v>79150</v>
+                                    <v>79104</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>5137</b>
-                                    <v>37379</v>
+                                    <v>37358</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28893,15 +28923,15 @@
         </relation>
         <relation>
             <name>funbind</name>
-            <cardinality>5787669</cardinality>
+            <cardinality>5788265</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>5785316</v>
+                    <v>5785803</v>
                 </e>
                 <e>
                     <k>fun</k>
-                    <v>274909</v>
+                    <v>275046</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28915,12 +28945,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5782964</v>
+                                    <v>5783341</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2352</v>
+                                    <v>2462</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28936,27 +28966,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>180650</v>
+                                    <v>180845</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>38212</v>
+                                    <v>38237</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>16764</v>
+                                    <v>17127</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>23286</v>
+                                    <v>23229</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>37798</b>
-                                    <v>15995</v>
+                                    <v>15607</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28966,19 +28996,19 @@
         </relation>
         <relation>
             <name>expr_allocator</name>
-            <cardinality>44756</cardinality>
+            <cardinality>44842</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>44756</v>
+                    <v>44842</v>
                 </e>
                 <e>
                     <k>func</k>
-                    <v>64</v>
+                    <v>101</v>
                 </e>
                 <e>
                     <k>form</k>
-                    <v>21</v>
+                    <v>33</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28992,7 +29022,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>44756</v>
+                                    <v>44842</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29008,7 +29038,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>44756</v>
+                                    <v>44842</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29022,19 +29052,19 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>21</v>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>33</v>
                                 </b>
                                 <b>
-                                    <a>369</a>
-                                    <b>370</b>
-                                    <v>21</v>
+                                    <a>591</a>
+                                    <b>592</b>
+                                    <v>33</v>
                                 </b>
                                 <b>
-                                    <a>1722</a>
-                                    <b>1723</b>
-                                    <v>21</v>
+                                    <a>736</a>
+                                    <b>737</b>
+                                    <v>33</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29050,7 +29080,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>64</v>
+                                    <v>101</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29064,9 +29094,9 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>2093</a>
-                                    <b>2094</b>
-                                    <v>21</v>
+                                    <a>1328</a>
+                                    <b>1329</b>
+                                    <v>33</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29082,7 +29112,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>21</v>
+                                    <v>33</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29092,15 +29122,15 @@
         </relation>
         <relation>
             <name>expr_deallocator</name>
-            <cardinality>53037</cardinality>
+            <cardinality>53351</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>53037</v>
+                    <v>53351</v>
                 </e>
                 <e>
                     <k>func</k>
-                    <v>100</v>
+                    <v>101</v>
                 </e>
                 <e>
                     <k>form</k>
@@ -29118,7 +29148,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53037</v>
+                                    <v>53351</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29134,7 +29164,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53037</v>
+                                    <v>53351</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29176,7 +29206,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>100</v>
+                                    <v>101</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29239,15 +29269,15 @@
         </relation>
         <relation>
             <name>expr_cond_guard</name>
-            <cardinality>898137</cardinality>
+            <cardinality>897622</cardinality>
             <columnsizes>
                 <e>
                     <k>cond</k>
-                    <v>898137</v>
+                    <v>897622</v>
                 </e>
                 <e>
                     <k>guard</k>
-                    <v>898137</v>
+                    <v>897622</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29261,7 +29291,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>898137</v>
+                                    <v>897622</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29277,7 +29307,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>898137</v>
+                                    <v>897622</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29287,15 +29317,15 @@
         </relation>
         <relation>
             <name>expr_cond_true</name>
-            <cardinality>898134</cardinality>
+            <cardinality>897618</cardinality>
             <columnsizes>
                 <e>
                     <k>cond</k>
-                    <v>898134</v>
+                    <v>897618</v>
                 </e>
                 <e>
                     <k>true</k>
-                    <v>898134</v>
+                    <v>897618</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29309,7 +29339,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>898134</v>
+                                    <v>897618</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29325,7 +29355,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>898134</v>
+                                    <v>897618</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29335,15 +29365,15 @@
         </relation>
         <relation>
             <name>expr_cond_false</name>
-            <cardinality>898137</cardinality>
+            <cardinality>897622</cardinality>
             <columnsizes>
                 <e>
                     <k>cond</k>
-                    <v>898137</v>
+                    <v>897622</v>
                 </e>
                 <e>
                     <k>false</k>
-                    <v>898137</v>
+                    <v>897622</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29357,7 +29387,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>898137</v>
+                                    <v>897622</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29373,7 +29403,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>898137</v>
+                                    <v>897622</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29383,15 +29413,15 @@
         </relation>
         <relation>
             <name>values</name>
-            <cardinality>13547098</cardinality>
+            <cardinality>13539325</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>13547098</v>
+                    <v>13539325</v>
                 </e>
                 <e>
                     <k>str</k>
-                    <v>114026</v>
+                    <v>113961</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29405,7 +29435,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13547098</v>
+                                    <v>13539325</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29421,27 +29451,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>77935</v>
+                                    <v>77890</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>15228</v>
+                                    <v>15220</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>8841</v>
+                                    <v>8836</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>52</b>
-                                    <v>8587</v>
+                                    <v>8582</v>
                                 </b>
                                 <b>
                                     <a>52</a>
                                     <b>681857</b>
-                                    <v>3432</v>
+                                    <v>3430</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29451,15 +29481,15 @@
         </relation>
         <relation>
             <name>valuetext</name>
-            <cardinality>6647904</cardinality>
+            <cardinality>6632066</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6647904</v>
+                    <v>6632066</v>
                 </e>
                 <e>
                     <k>text</k>
-                    <v>1095330</v>
+                    <v>1095191</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29473,7 +29503,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6647904</v>
+                                    <v>6632066</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29489,22 +29519,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>833965</v>
+                                    <v>833960</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>146908</v>
+                                    <v>146907</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>86571</v>
+                                    <v>86513</v>
                                 </b>
                                 <b>
                                     <a>7</a>
-                                    <b>593706</b>
-                                    <v>27886</v>
+                                    <b>594514</b>
+                                    <v>27811</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29514,15 +29544,15 @@
         </relation>
         <relation>
             <name>valuebind</name>
-            <cardinality>13655359</cardinality>
+            <cardinality>13647524</cardinality>
             <columnsizes>
                 <e>
                     <k>val</k>
-                    <v>13547098</v>
+                    <v>13539325</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>13655359</v>
+                    <v>13647524</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29536,12 +29566,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13456848</v>
+                                    <v>13449127</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>90250</v>
+                                    <v>90198</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29557,7 +29587,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13655359</v>
+                                    <v>13647524</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29567,15 +29597,15 @@
         </relation>
         <relation>
             <name>fieldoffsets</name>
-            <cardinality>1503078</cardinality>
+            <cardinality>1502215</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1503078</v>
+                    <v>1502215</v>
                 </e>
                 <e>
                     <k>byteoffset</k>
-                    <v>31374</v>
+                    <v>31356</v>
                 </e>
                 <e>
                     <k>bitoffset</k>
@@ -29593,7 +29623,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1503078</v>
+                                    <v>1502215</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29609,7 +29639,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1503078</v>
+                                    <v>1502215</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29625,32 +29655,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17702</v>
+                                    <v>17692</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2451</v>
+                                    <v>2449</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>2668</v>
+                                    <v>2667</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>12</b>
-                                    <v>2614</v>
+                                    <v>2613</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>35</b>
-                                    <v>2396</v>
+                                    <v>2395</v>
                                 </b>
                                 <b>
                                     <a>35</a>
                                     <b>200</b>
-                                    <v>2396</v>
+                                    <v>2395</v>
                                 </b>
                                 <b>
                                     <a>210</a>
@@ -29671,7 +29701,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30339</v>
+                                    <v>30321</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29773,11 +29803,11 @@
         </relation>
         <relation>
             <name>bitfield</name>
-            <cardinality>29829</cardinality>
+            <cardinality>29835</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>29829</v>
+                    <v>29835</v>
                 </e>
                 <e>
                     <k>bits</k>
@@ -29799,7 +29829,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29829</v>
+                                    <v>29835</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29815,7 +29845,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29829</v>
+                                    <v>29835</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29959,23 +29989,23 @@
         </relation>
         <relation>
             <name>initialisers</name>
-            <cardinality>2289023</cardinality>
+            <cardinality>2292690</cardinality>
             <columnsizes>
                 <e>
                     <k>init</k>
-                    <v>2289023</v>
+                    <v>2292690</v>
                 </e>
                 <e>
                     <k>var</k>
-                    <v>998370</v>
+                    <v>998340</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>2289023</v>
+                    <v>2292690</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>525173</v>
+                    <v>526645</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29989,7 +30019,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2289023</v>
+                                    <v>2292690</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30005,7 +30035,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2289023</v>
+                                    <v>2292690</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30021,7 +30051,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2289023</v>
+                                    <v>2292690</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30037,17 +30067,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>874745</v>
+                                    <v>874360</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>15</b>
-                                    <v>51071</v>
+                                    <v>51218</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>25</b>
-                                    <v>72553</v>
+                                    <v>72761</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30063,17 +30093,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>874745</v>
+                                    <v>874360</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>15</b>
-                                    <v>51071</v>
+                                    <v>51218</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>25</b>
-                                    <v>72553</v>
+                                    <v>72761</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30089,7 +30119,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>998362</v>
+                                    <v>998332</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30110,7 +30140,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2289023</v>
+                                    <v>2292690</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30126,7 +30156,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2289023</v>
+                                    <v>2292690</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30142,7 +30172,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2289023</v>
+                                    <v>2292690</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30158,22 +30188,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>414711</v>
+                                    <v>415900</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>33393</v>
+                                    <v>33497</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>41518</v>
+                                    <v>41612</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>113696</b>
-                                    <v>35549</v>
+                                    <v>35635</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30189,17 +30219,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>453031</v>
+                                    <v>454329</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>34225</v>
+                                    <v>34331</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>12835</b>
-                                    <v>37916</v>
+                                    <v>37984</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30215,22 +30245,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>414711</v>
+                                    <v>415900</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>33393</v>
+                                    <v>33497</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>41518</v>
+                                    <v>41612</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>113696</b>
-                                    <v>35549</v>
+                                    <v>35635</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30240,26 +30270,26 @@
         </relation>
         <relation>
             <name>braced_initialisers</name>
-            <cardinality>67191</cardinality>
+            <cardinality>67888</cardinality>
             <columnsizes>
                 <e>
                     <k>init</k>
-                    <v>67191</v>
+                    <v>67888</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>expr_ancestor</name>
-            <cardinality>1667335</cardinality>
+            <cardinality>1669204</cardinality>
             <columnsizes>
                 <e>
                     <k>exp</k>
-                    <v>1667335</v>
+                    <v>1669204</v>
                 </e>
                 <e>
                     <k>ancestor</k>
-                    <v>834480</v>
+                    <v>835480</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30273,7 +30303,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1667335</v>
+                                    <v>1669204</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30289,17 +30319,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16978</v>
+                                    <v>16999</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>807494</v>
+                                    <v>808504</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>19</b>
-                                    <v>10007</v>
+                                    <v>9976</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30309,19 +30339,19 @@
         </relation>
         <relation>
             <name>exprs</name>
-            <cardinality>25217889</cardinality>
+            <cardinality>25203419</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>25217889</v>
+                    <v>25203419</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>1451</v>
+                    <v>1450</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>10588753</v>
+                    <v>10582678</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30335,7 +30365,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25217889</v>
+                                    <v>25203419</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30351,7 +30381,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25217889</v>
+                                    <v>25203419</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30529,22 +30559,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8906278</v>
+                                    <v>8901168</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>820855</v>
+                                    <v>820384</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>16</b>
-                                    <v>797438</v>
+                                    <v>796981</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>71733</b>
-                                    <v>64181</v>
+                                    <v>64144</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30560,17 +30590,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9045722</v>
+                                    <v>9040532</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>774505</v>
+                                    <v>774061</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>32</b>
-                                    <v>768525</v>
+                                    <v>768084</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30580,15 +30610,15 @@
         </relation>
         <relation>
             <name>expr_reuse</name>
-            <cardinality>841815</cardinality>
+            <cardinality>842823</cardinality>
             <columnsizes>
                 <e>
                     <k>reuse</k>
-                    <v>841815</v>
+                    <v>842823</v>
                 </e>
                 <e>
                     <k>original</k>
-                    <v>841815</v>
+                    <v>842823</v>
                 </e>
                 <e>
                     <k>value_category</k>
@@ -30606,7 +30636,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>841815</v>
+                                    <v>842823</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30622,7 +30652,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>841815</v>
+                                    <v>842823</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30638,7 +30668,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>841815</v>
+                                    <v>842823</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30654,7 +30684,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>841815</v>
+                                    <v>842823</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30706,15 +30736,15 @@
         </relation>
         <relation>
             <name>expr_types</name>
-            <cardinality>25217889</cardinality>
+            <cardinality>25203419</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>25217889</v>
+                    <v>25203419</v>
                 </e>
                 <e>
                     <k>typeid</k>
-                    <v>214267</v>
+                    <v>214144</v>
                 </e>
                 <e>
                     <k>value_category</k>
@@ -30732,7 +30762,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25217889</v>
+                                    <v>25203419</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30748,7 +30778,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25217889</v>
+                                    <v>25203419</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30764,52 +30794,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52527</v>
+                                    <v>52497</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>35201</v>
+                                    <v>35181</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>14511</v>
+                                    <v>14503</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>14533</v>
+                                    <v>14525</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>17567</v>
+                                    <v>17557</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>14</b>
-                                    <v>17392</v>
+                                    <v>17382</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>24</b>
-                                    <v>16446</v>
+                                    <v>16437</v>
                                 </b>
                                 <b>
                                     <a>24</a>
                                     <b>49</b>
-                                    <v>16072</v>
+                                    <v>16063</v>
                                 </b>
                                 <b>
                                     <a>49</a>
                                     <b>134</b>
-                                    <v>16182</v>
+                                    <v>16173</v>
                                 </b>
                                 <b>
                                     <a>134</a>
                                     <b>441492</b>
-                                    <v>13830</v>
+                                    <v>13822</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30825,12 +30855,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>185969</v>
+                                    <v>185862</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>28297</v>
+                                    <v>28281</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30893,15 +30923,15 @@
         </relation>
         <relation>
             <name>new_allocated_type</name>
-            <cardinality>45518</cardinality>
+            <cardinality>45787</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>45518</v>
+                    <v>45787</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>26988</v>
+                    <v>27148</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30915,7 +30945,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>45518</v>
+                                    <v>45787</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30931,17 +30961,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11345</v>
+                                    <v>11413</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>14266</v>
+                                    <v>14350</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>19</b>
-                                    <v>1376</v>
+                                    <v>1384</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30951,15 +30981,15 @@
         </relation>
         <relation>
             <name>new_array_allocated_type</name>
-            <cardinality>6597</cardinality>
+            <cardinality>6616</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>6597</v>
+                    <v>6616</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>2834</v>
+                    <v>2842</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30973,7 +31003,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6597</v>
+                                    <v>6616</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30994,7 +31024,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2503</v>
+                                    <v>2510</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -31014,30 +31044,30 @@
         </relation>
         <relation>
             <name>param_ref_to_this</name>
-            <cardinality>25020</cardinality>
+            <cardinality>25267</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>25020</v>
+                    <v>25267</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>aggregate_field_init</name>
-            <cardinality>5717385</cardinality>
+            <cardinality>5720718</cardinality>
             <columnsizes>
                 <e>
                     <k>aggregate</k>
-                    <v>1243071</v>
+                    <v>1245402</v>
                 </e>
                 <e>
                     <k>initializer</k>
-                    <v>5717207</v>
+                    <v>5720540</v>
                 </e>
                 <e>
                     <k>field</k>
-                    <v>3229</v>
+                    <v>3236</v>
                 </e>
                 <e>
                     <k>position</k>
@@ -31059,12 +31089,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19692</v>
+                                    <v>21021</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>669033</v>
+                                    <v>670035</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -31110,12 +31140,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19688</v>
+                                    <v>21017</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>668965</v>
+                                    <v>669967</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -31161,12 +31191,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19692</v>
+                                    <v>21021</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>669033</v>
+                                    <v>670035</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -31212,7 +31242,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1242989</v>
+                                    <v>1245320</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31233,7 +31263,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5717207</v>
+                                    <v>5720540</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31249,7 +31279,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5717029</v>
+                                    <v>5720362</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31270,7 +31300,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5717207</v>
+                                    <v>5720540</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31286,7 +31316,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5717207</v>
+                                    <v>5720540</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31307,12 +31337,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>272</v>
+                                    <v>273</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>274</v>
+                                    <v>275</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -31331,18 +31361,18 @@
                                 </b>
                                 <b>
                                     <a>74</a>
-                                    <b>339</b>
-                                    <v>243</v>
+                                    <b>316</b>
+                                    <v>244</v>
                                 </b>
                                 <b>
-                                    <a>353</a>
-                                    <b>252555</b>
-                                    <v>252</v>
+                                    <a>338</a>
+                                    <b>252258</b>
+                                    <v>244</v>
                                 </b>
                                 <b>
-                                    <a>392631</a>
+                                    <a>252554</a>
                                     <b>392632</b>
-                                    <v>2</v>
+                                    <v>14</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31363,12 +31393,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>272</v>
+                                    <v>273</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>274</v>
+                                    <v>275</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -31387,18 +31417,18 @@
                                 </b>
                                 <b>
                                     <a>74</a>
-                                    <b>339</b>
-                                    <v>243</v>
+                                    <b>316</b>
+                                    <v>244</v>
                                 </b>
                                 <b>
-                                    <a>353</a>
-                                    <b>252555</b>
-                                    <v>252</v>
+                                    <a>338</a>
+                                    <b>252258</b>
+                                    <v>244</v>
                                 </b>
                                 <b>
-                                    <a>392631</a>
+                                    <a>252554</a>
                                     <b>392632</b>
-                                    <v>2</v>
+                                    <v>14</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31414,7 +31444,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3215</v>
+                                    <v>3222</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31435,7 +31465,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3203</v>
+                                    <v>3210</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31505,12 +31535,12 @@
                                 </b>
                                 <b>
                                     <a>554346</a>
-                                    <b>1223380</b>
+                                    <b>1224382</b>
                                     <v>2</v>
                                 </b>
                                 <b>
-                                    <a>1243071</a>
-                                    <b>1243072</b>
+                                    <a>1245402</a>
+                                    <b>1245403</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -31576,12 +31606,12 @@
                                 </b>
                                 <b>
                                     <a>554346</a>
-                                    <b>1223380</b>
+                                    <b>1224382</b>
                                     <v>2</v>
                                 </b>
                                 <b>
-                                    <a>1243071</a>
-                                    <b>1243072</b>
+                                    <a>1245402</a>
+                                    <b>1245403</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -31647,12 +31677,12 @@
                                 </b>
                                 <b>
                                     <a>318</a>
-                                    <b>885</b>
+                                    <b>886</b>
                                     <v>2</v>
                                 </b>
                                 <b>
-                                    <a>1285</a>
-                                    <b>1286</b>
+                                    <a>1291</a>
+                                    <b>1292</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -31688,13 +31718,13 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>480</a>
-                                    <b>481</b>
+                                    <a>1482</a>
+                                    <b>1483</b>
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>1242673</a>
-                                    <b>1242674</b>
+                                    <a>1244002</a>
+                                    <b>1244003</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -31709,13 +31739,13 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>710</a>
-                                    <b>711</b>
+                                    <a>1712</a>
+                                    <b>1713</b>
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>5716497</a>
-                                    <b>5716498</b>
+                                    <a>5718828</a>
+                                    <b>5718829</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -31730,13 +31760,13 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>218</a>
-                                    <b>219</b>
+                                    <a>219</a>
+                                    <b>220</b>
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>3037</a>
-                                    <b>3038</b>
+                                    <a>3043</a>
+                                    <b>3044</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -31768,15 +31798,15 @@
         </relation>
         <relation>
             <name>aggregate_array_init</name>
-            <cardinality>1349502</cardinality>
+            <cardinality>1353666</cardinality>
             <columnsizes>
                 <e>
                     <k>aggregate</k>
-                    <v>152357</v>
+                    <v>153359</v>
                 </e>
                 <e>
                     <k>initializer</k>
-                    <v>1349502</v>
+                    <v>1353666</v>
                 </e>
                 <e>
                     <k>element_index</k>
@@ -31802,27 +31832,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14696</v>
+                                    <v>14702</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>13903</v>
+                                    <v>13963</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>61677</v>
+                                    <v>61827</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>17014</v>
+                                    <v>17356</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>19009</v>
+                                    <v>19453</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -31831,13 +31861,13 @@
                                 </b>
                                 <b>
                                     <a>10</a>
-                                    <b>58</b>
-                                    <v>11429</v>
+                                    <b>61</b>
+                                    <v>11514</v>
                                 </b>
                                 <b>
-                                    <a>58</a>
+                                    <a>61</a>
                                     <b>62923</b>
-                                    <v>1763</v>
+                                    <v>1678</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31853,27 +31883,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14696</v>
+                                    <v>14702</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>13903</v>
+                                    <v>13963</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>61677</v>
+                                    <v>61827</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>17014</v>
+                                    <v>17356</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>19009</v>
+                                    <v>19453</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -31882,13 +31912,13 @@
                                 </b>
                                 <b>
                                     <a>10</a>
-                                    <b>58</b>
-                                    <v>11429</v>
+                                    <b>61</b>
+                                    <v>11514</v>
                                 </b>
                                 <b>
-                                    <a>58</a>
+                                    <a>61</a>
                                     <b>62923</b>
-                                    <v>1763</v>
+                                    <v>1678</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31904,27 +31934,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14696</v>
+                                    <v>14702</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>13903</v>
+                                    <v>13963</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>61677</v>
+                                    <v>61827</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>17014</v>
+                                    <v>17356</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>19009</v>
+                                    <v>19453</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -31933,13 +31963,13 @@
                                 </b>
                                 <b>
                                     <a>10</a>
-                                    <b>58</b>
-                                    <v>11429</v>
+                                    <b>61</b>
+                                    <v>11514</v>
                                 </b>
                                 <b>
-                                    <a>58</a>
+                                    <a>61</a>
                                     <b>62923</b>
-                                    <v>1763</v>
+                                    <v>1678</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31955,7 +31985,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>152357</v>
+                                    <v>153359</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31971,7 +32001,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1349502</v>
+                                    <v>1353666</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31987,7 +32017,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1349502</v>
+                                    <v>1353666</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32003,7 +32033,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1349502</v>
+                                    <v>1353666</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32019,7 +32049,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1349502</v>
+                                    <v>1353666</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32059,7 +32089,7 @@
                                 </b>
                                 <b>
                                     <a>37</a>
-                                    <b>152357</b>
+                                    <b>153359</b>
                                     <v>2151</v>
                                 </b>
                             </bs>
@@ -32100,7 +32130,7 @@
                                 </b>
                                 <b>
                                     <a>37</a>
-                                    <b>152357</b>
+                                    <b>153359</b>
                                     <v>2151</v>
                                 </b>
                             </bs>
@@ -32183,7 +32213,7 @@
                                 </b>
                                 <b>
                                     <a>37</a>
-                                    <b>152358</b>
+                                    <b>153360</b>
                                     <v>2151</v>
                                 </b>
                             </bs>
@@ -32224,7 +32254,7 @@
                                 </b>
                                 <b>
                                     <a>37</a>
-                                    <b>152358</b>
+                                    <b>153360</b>
                                     <v>2151</v>
                                 </b>
                             </bs>
@@ -32286,8 +32316,8 @@
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>152354</a>
-                                    <b>152355</b>
+                                    <a>153356</a>
+                                    <b>153357</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -32307,8 +32337,8 @@
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>1349486</a>
-                                    <b>1349487</b>
+                                    <a>1353650</a>
+                                    <b>1353651</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -32361,15 +32391,15 @@
         </relation>
         <relation>
             <name>condition_decl_bind</name>
-            <cardinality>406398</cardinality>
+            <cardinality>406885</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>406398</v>
+                    <v>406885</v>
                 </e>
                 <e>
                     <k>decl</k>
-                    <v>406398</v>
+                    <v>406885</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32383,7 +32413,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>406398</v>
+                                    <v>406885</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32399,7 +32429,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>406398</v>
+                                    <v>406885</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32409,15 +32439,15 @@
         </relation>
         <relation>
             <name>typeid_bind</name>
-            <cardinality>47196</cardinality>
+            <cardinality>47476</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>47196</v>
+                    <v>47476</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>15709</v>
+                    <v>15802</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32431,7 +32461,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>47196</v>
+                                    <v>47476</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32447,17 +32477,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2920</v>
+                                    <v>2937</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12386</v>
+                                    <v>12459</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>328</b>
-                                    <v>402</v>
+                                    <v>405</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32467,15 +32497,15 @@
         </relation>
         <relation>
             <name>uuidof_bind</name>
-            <cardinality>26214</cardinality>
+            <cardinality>26289</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>26214</v>
+                    <v>26289</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>26214</v>
+                    <v>26289</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32489,7 +32519,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26214</v>
+                                    <v>26289</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32505,7 +32535,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26214</v>
+                                    <v>26289</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32515,15 +32545,15 @@
         </relation>
         <relation>
             <name>sizeof_bind</name>
-            <cardinality>242078</cardinality>
+            <cardinality>241939</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>242078</v>
+                    <v>241939</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>11156</v>
+                    <v>11150</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32537,7 +32567,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>242078</v>
+                                    <v>241939</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32553,17 +32583,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3859</v>
+                                    <v>3856</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2753</v>
+                                    <v>2751</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1019</v>
+                                    <v>1018</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -32578,17 +32608,17 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>1117</v>
+                                    <v>1116</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>42</b>
-                                    <v>852</v>
+                                    <v>851</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>6061</b>
-                                    <v>167</v>
+                                    <v>166</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32646,11 +32676,11 @@
         </relation>
         <relation>
             <name>lambdas</name>
-            <cardinality>18970</cardinality>
+            <cardinality>19024</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>18970</v>
+                    <v>19024</v>
                 </e>
                 <e>
                     <k>default_capture</k>
@@ -32676,7 +32706,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18970</v>
+                                    <v>19024</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32692,7 +32722,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18970</v>
+                                    <v>19024</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32708,7 +32738,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18970</v>
+                                    <v>19024</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32892,15 +32922,15 @@
         </relation>
         <relation>
             <name>lambda_capture</name>
-            <cardinality>31810</cardinality>
+            <cardinality>31901</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>31810</v>
+                    <v>31901</v>
                 </e>
                 <e>
                     <k>lambda</k>
-                    <v>15424</v>
+                    <v>15469</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -32908,7 +32938,7 @@
                 </e>
                 <e>
                     <k>field</k>
-                    <v>31810</v>
+                    <v>31901</v>
                 </e>
                 <e>
                     <k>captured_by_reference</k>
@@ -32920,7 +32950,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>17888</v>
+                    <v>17939</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32934,7 +32964,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31810</v>
+                                    <v>31901</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32950,7 +32980,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31810</v>
+                                    <v>31901</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32966,7 +32996,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31810</v>
+                                    <v>31901</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32982,7 +33012,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31810</v>
+                                    <v>31901</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32998,7 +33028,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31810</v>
+                                    <v>31901</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33014,7 +33044,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31810</v>
+                                    <v>31901</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33030,27 +33060,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8156</v>
+                                    <v>8179</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3545</v>
+                                    <v>3555</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1663</v>
+                                    <v>1668</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>1251</v>
+                                    <v>1255</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>18</b>
-                                    <v>807</v>
+                                    <v>809</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33066,27 +33096,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8156</v>
+                                    <v>8179</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3545</v>
+                                    <v>3555</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1663</v>
+                                    <v>1668</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>1251</v>
+                                    <v>1255</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>18</b>
-                                    <v>807</v>
+                                    <v>809</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33102,27 +33132,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8156</v>
+                                    <v>8179</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3545</v>
+                                    <v>3555</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1663</v>
+                                    <v>1668</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>1251</v>
+                                    <v>1255</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>18</b>
-                                    <v>807</v>
+                                    <v>809</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33138,12 +33168,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14189</v>
+                                    <v>14229</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1235</v>
+                                    <v>1239</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33159,7 +33189,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15303</v>
+                                    <v>15347</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -33180,27 +33210,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8746</v>
+                                    <v>8771</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3698</v>
+                                    <v>3709</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1397</v>
+                                    <v>1401</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>1284</v>
+                                    <v>1287</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>18</b>
-                                    <v>298</v>
+                                    <v>299</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33509,7 +33539,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>104</v>
+                                    <v>105</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33525,7 +33555,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>88</v>
+                                    <v>89</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -33642,7 +33672,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31810</v>
+                                    <v>31901</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33658,7 +33688,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31810</v>
+                                    <v>31901</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33674,7 +33704,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31810</v>
+                                    <v>31901</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33690,7 +33720,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31810</v>
+                                    <v>31901</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33706,7 +33736,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31810</v>
+                                    <v>31901</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33722,7 +33752,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31810</v>
+                                    <v>31901</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33980,17 +34010,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15667</v>
+                                    <v>15712</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>1413</v>
+                                    <v>1417</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>68</b>
-                                    <v>807</v>
+                                    <v>809</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34006,17 +34036,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16240</v>
+                                    <v>16287</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>13</b>
-                                    <v>1445</v>
+                                    <v>1449</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>68</b>
-                                    <v>201</v>
+                                    <v>202</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34032,12 +34062,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17201</v>
+                                    <v>17250</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>686</v>
+                                    <v>688</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34053,17 +34083,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15667</v>
+                                    <v>15712</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>1413</v>
+                                    <v>1417</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>68</b>
-                                    <v>807</v>
+                                    <v>809</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34079,7 +34109,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17863</v>
+                                    <v>17915</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -34100,7 +34130,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17888</v>
+                                    <v>17939</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34110,11 +34140,11 @@
         </relation>
         <relation>
             <name>fold</name>
-            <cardinality>1261</cardinality>
+            <cardinality>1263</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>1261</v>
+                    <v>1263</v>
                 </e>
                 <e>
                     <k>operator</k>
@@ -34136,7 +34166,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1261</v>
+                                    <v>1263</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34152,7 +34182,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1261</v>
+                                    <v>1263</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34236,11 +34266,11 @@
         </relation>
         <relation>
             <name>stmts</name>
-            <cardinality>6310367</cardinality>
+            <cardinality>6328636</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6310367</v>
+                    <v>6328636</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -34248,7 +34278,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2668742</v>
+                    <v>2676389</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34262,7 +34292,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6310367</v>
+                                    <v>6328636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34278,7 +34308,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6310367</v>
+                                    <v>6328636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34367,28 +34397,28 @@
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>74923</a>
-                                    <b>74924</b>
+                                    <a>74926</a>
+                                    <b>74927</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>95366</a>
-                                    <b>95367</b>
+                                    <a>95367</a>
+                                    <b>95368</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>117878</a>
-                                    <b>117879</b>
+                                    <a>117880</a>
+                                    <b>117881</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>198406</a>
-                                    <b>198407</b>
+                                    <a>198412</a>
+                                    <b>198413</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>213672</a>
-                                    <b>213673</b>
+                                    <a>213683</a>
+                                    <b>213684</b>
                                     <v>8</v>
                                 </b>
                             </bs>
@@ -34516,22 +34546,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2218981</v>
+                                    <v>2225153</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>177039</v>
+                                    <v>177732</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>11</b>
-                                    <v>202889</v>
+                                    <v>203471</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>1816</b>
-                                    <v>69832</v>
+                                    <v>70032</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34547,12 +34577,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2592497</v>
+                                    <v>2599926</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>76244</v>
+                                    <v>76462</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34717,15 +34747,15 @@
         </relation>
         <relation>
             <name>if_then</name>
-            <cardinality>990500</cardinality>
+            <cardinality>989932</cardinality>
             <columnsizes>
                 <e>
                     <k>if_stmt</k>
-                    <v>990500</v>
+                    <v>989932</v>
                 </e>
                 <e>
                     <k>then_id</k>
-                    <v>990500</v>
+                    <v>989932</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34739,7 +34769,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>990500</v>
+                                    <v>989932</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34755,7 +34785,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>990500</v>
+                                    <v>989932</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34765,15 +34795,15 @@
         </relation>
         <relation>
             <name>if_else</name>
-            <cardinality>434390</cardinality>
+            <cardinality>434910</cardinality>
             <columnsizes>
                 <e>
                     <k>if_stmt</k>
-                    <v>434390</v>
+                    <v>434910</v>
                 </e>
                 <e>
                     <k>else_id</k>
-                    <v>434390</v>
+                    <v>434910</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34787,7 +34817,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>434390</v>
+                                    <v>434910</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34803,7 +34833,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>434390</v>
+                                    <v>434910</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34861,15 +34891,15 @@
         </relation>
         <relation>
             <name>constexpr_if_then</name>
-            <cardinality>103236</cardinality>
+            <cardinality>103259</cardinality>
             <columnsizes>
                 <e>
                     <k>constexpr_if_stmt</k>
-                    <v>103236</v>
+                    <v>103259</v>
                 </e>
                 <e>
                     <k>then_id</k>
-                    <v>103236</v>
+                    <v>103259</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34883,7 +34913,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>103236</v>
+                                    <v>103259</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34899,7 +34929,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>103236</v>
+                                    <v>103259</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34909,15 +34939,15 @@
         </relation>
         <relation>
             <name>constexpr_if_else</name>
-            <cardinality>74021</cardinality>
+            <cardinality>74037</cardinality>
             <columnsizes>
                 <e>
                     <k>constexpr_if_stmt</k>
-                    <v>74021</v>
+                    <v>74037</v>
                 </e>
                 <e>
                     <k>else_id</k>
-                    <v>74021</v>
+                    <v>74037</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34931,7 +34961,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>74021</v>
+                                    <v>74037</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34947,7 +34977,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>74021</v>
+                                    <v>74037</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35053,15 +35083,15 @@
         </relation>
         <relation>
             <name>while_body</name>
-            <cardinality>39659</cardinality>
+            <cardinality>39636</cardinality>
             <columnsizes>
                 <e>
                     <k>while_stmt</k>
-                    <v>39659</v>
+                    <v>39636</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>39659</v>
+                    <v>39636</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35075,7 +35105,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39659</v>
+                                    <v>39636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35091,7 +35121,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39659</v>
+                                    <v>39636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35101,15 +35131,15 @@
         </relation>
         <relation>
             <name>do_body</name>
-            <cardinality>232528</cardinality>
+            <cardinality>232395</cardinality>
             <columnsizes>
                 <e>
                     <k>do_stmt</k>
-                    <v>232528</v>
+                    <v>232395</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>232528</v>
+                    <v>232395</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35123,7 +35153,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>232528</v>
+                                    <v>232395</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35139,7 +35169,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>232528</v>
+                                    <v>232395</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35197,19 +35227,19 @@
         </relation>
         <relation>
             <name>switch_case</name>
-            <cardinality>830952</cardinality>
+            <cardinality>831947</cardinality>
             <columnsizes>
                 <e>
                     <k>switch_stmt</k>
-                    <v>409306</v>
+                    <v>409797</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>384</v>
+                    <v>385</v>
                 </e>
                 <e>
                     <k>case_id</k>
-                    <v>830952</v>
+                    <v>831947</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35228,12 +35258,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>406441</v>
+                                    <v>406928</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>19</b>
-                                    <v>2844</v>
+                                    <v>2847</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35254,12 +35284,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>406441</v>
+                                    <v>406928</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>19</b>
-                                    <v>2844</v>
+                                    <v>2847</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35417,7 +35447,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>830952</v>
+                                    <v>831947</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35433,7 +35463,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>830952</v>
+                                    <v>831947</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35443,15 +35473,15 @@
         </relation>
         <relation>
             <name>switch_body</name>
-            <cardinality>409306</cardinality>
+            <cardinality>409797</cardinality>
             <columnsizes>
                 <e>
                     <k>switch_stmt</k>
-                    <v>409306</v>
+                    <v>409797</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>409306</v>
+                    <v>409797</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35465,7 +35495,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>409306</v>
+                                    <v>409797</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35481,7 +35511,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>409306</v>
+                                    <v>409797</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35491,15 +35521,15 @@
         </relation>
         <relation>
             <name>for_initialization</name>
-            <cardinality>73267</cardinality>
+            <cardinality>73225</cardinality>
             <columnsizes>
                 <e>
                     <k>for_stmt</k>
-                    <v>73267</v>
+                    <v>73225</v>
                 </e>
                 <e>
                     <k>init_id</k>
-                    <v>73267</v>
+                    <v>73225</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35513,7 +35543,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73267</v>
+                                    <v>73225</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35529,7 +35559,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73267</v>
+                                    <v>73225</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35539,15 +35569,15 @@
         </relation>
         <relation>
             <name>for_condition</name>
-            <cardinality>76363</cardinality>
+            <cardinality>76319</cardinality>
             <columnsizes>
                 <e>
                     <k>for_stmt</k>
-                    <v>76363</v>
+                    <v>76319</v>
                 </e>
                 <e>
                     <k>condition_id</k>
-                    <v>76363</v>
+                    <v>76319</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35561,7 +35591,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>76363</v>
+                                    <v>76319</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35577,7 +35607,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>76363</v>
+                                    <v>76319</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35587,15 +35617,15 @@
         </relation>
         <relation>
             <name>for_update</name>
-            <cardinality>73407</cardinality>
+            <cardinality>73365</cardinality>
             <columnsizes>
                 <e>
                     <k>for_stmt</k>
-                    <v>73407</v>
+                    <v>73365</v>
                 </e>
                 <e>
                     <k>update_id</k>
-                    <v>73407</v>
+                    <v>73365</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35609,7 +35639,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73407</v>
+                                    <v>73365</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35625,7 +35655,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73407</v>
+                                    <v>73365</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35635,15 +35665,15 @@
         </relation>
         <relation>
             <name>for_body</name>
-            <cardinality>84413</cardinality>
+            <cardinality>84365</cardinality>
             <columnsizes>
                 <e>
                     <k>for_stmt</k>
-                    <v>84413</v>
+                    <v>84365</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>84413</v>
+                    <v>84365</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35657,7 +35687,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>84413</v>
+                                    <v>84365</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35673,7 +35703,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>84413</v>
+                                    <v>84365</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35683,19 +35713,19 @@
         </relation>
         <relation>
             <name>stmtparents</name>
-            <cardinality>5589515</cardinality>
+            <cardinality>5605702</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5589515</v>
+                    <v>5605702</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>15683</v>
+                    <v>15728</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>2355552</v>
+                    <v>2362374</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35709,7 +35739,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5589515</v>
+                                    <v>5605702</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35725,7 +35755,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5589515</v>
+                                    <v>5605702</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35741,52 +35771,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5152</v>
+                                    <v>5167</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1284</v>
+                                    <v>1287</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>266</v>
+                                    <v>267</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>2010</v>
+                                    <v>2016</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>1308</v>
+                                    <v>1312</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>12</b>
-                                    <v>1017</v>
+                                    <v>1020</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>29</b>
-                                    <v>1380</v>
+                                    <v>1384</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>39</b>
-                                    <v>1179</v>
+                                    <v>1182</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>78</b>
-                                    <v>1187</v>
+                                    <v>1190</v>
                                 </b>
                                 <b>
                                     <a>78</a>
-                                    <b>207977</b>
-                                    <v>896</v>
+                                    <b>207983</b>
+                                    <v>898</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35802,52 +35832,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5152</v>
+                                    <v>5167</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1284</v>
+                                    <v>1287</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>266</v>
+                                    <v>267</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>2010</v>
+                                    <v>2016</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>1308</v>
+                                    <v>1312</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>12</b>
-                                    <v>1017</v>
+                                    <v>1020</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>29</b>
-                                    <v>1380</v>
+                                    <v>1384</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>39</b>
-                                    <v>1179</v>
+                                    <v>1182</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>78</b>
-                                    <v>1187</v>
+                                    <v>1190</v>
                                 </b>
                                 <b>
                                     <a>78</a>
-                                    <b>207977</b>
-                                    <v>896</v>
+                                    <b>207983</b>
+                                    <v>898</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35863,32 +35893,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1338178</v>
+                                    <v>1342037</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>514505</v>
+                                    <v>516011</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>150687</v>
+                                    <v>151119</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>154814</v>
+                                    <v>155274</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>16</b>
-                                    <v>178500</v>
+                                    <v>179012</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>1943</b>
-                                    <v>18865</v>
+                                    <v>18919</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35904,32 +35934,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1338178</v>
+                                    <v>1342037</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>514505</v>
+                                    <v>516011</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>150687</v>
+                                    <v>151119</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>154814</v>
+                                    <v>155274</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>16</b>
-                                    <v>178500</v>
+                                    <v>179012</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>1943</b>
-                                    <v>18865</v>
+                                    <v>18919</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35939,30 +35969,30 @@
         </relation>
         <relation>
             <name>ishandler</name>
-            <cardinality>42985</cardinality>
+            <cardinality>43492</cardinality>
             <columnsizes>
                 <e>
                     <k>block</k>
-                    <v>42985</v>
+                    <v>43492</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>stmt_decl_bind</name>
-            <cardinality>724033</cardinality>
+            <cardinality>728504</cardinality>
             <columnsizes>
                 <e>
                     <k>stmt</k>
-                    <v>713534</v>
+                    <v>688131</v>
                 </e>
                 <e>
                     <k>num</k>
-                    <v>72</v>
+                    <v>125</v>
                 </e>
                 <e>
                     <k>decl</k>
-                    <v>724033</v>
+                    <v>728435</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35976,12 +36006,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>706121</v>
+                                    <v>665975</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>10</b>
-                                    <v>7413</v>
+                                    <b>32</b>
+                                    <v>22156</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35997,12 +36027,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>706121</v>
+                                    <v>665975</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>10</b>
-                                    <v>7413</v>
+                                    <b>32</b>
+                                    <v>22156</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36016,48 +36046,53 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>14</a>
-                                    <b>15</b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>52</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>15</a>
-                                    <b>16</b>
+                                    <a>3</a>
+                                    <b>5</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>19</b>
+                                    <a>7</a>
+                                    <b>11</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>21</a>
-                                    <b>22</b>
+                                    <a>11</a>
+                                    <b>15</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>25</a>
-                                    <b>26</b>
+                                    <a>21</a>
+                                    <b>45</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>60</a>
-                                    <b>61</b>
+                                    <a>86</a>
+                                    <b>121</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>229</a>
-                                    <b>230</b>
+                                    <a>205</a>
+                                    <b>357</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>918</a>
-                                    <b>919</b>
+                                    <a>1067</a>
+                                    <b>2544</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>88354</a>
-                                    <b>88355</b>
+                                    <a>5483</a>
+                                    <b>170293</b>
                                     <v>8</v>
                                 </b>
                             </bs>
@@ -36072,48 +36107,53 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>14</a>
-                                    <b>15</b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>52</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>15</a>
-                                    <b>16</b>
+                                    <a>3</a>
+                                    <b>5</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>19</b>
+                                    <a>7</a>
+                                    <b>11</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>21</a>
-                                    <b>22</b>
+                                    <a>11</a>
+                                    <b>15</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>25</a>
-                                    <b>26</b>
+                                    <a>21</a>
+                                    <b>45</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>60</a>
-                                    <b>61</b>
+                                    <a>86</a>
+                                    <b>121</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>229</a>
-                                    <b>230</b>
+                                    <a>205</a>
+                                    <b>357</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>918</a>
-                                    <b>919</b>
+                                    <a>1067</a>
+                                    <b>2544</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>88354</a>
-                                    <b>88355</b>
+                                    <a>5483</a>
+                                    <b>170276</b>
                                     <v>8</v>
                                 </b>
                             </bs>
@@ -36130,7 +36170,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>724033</v>
+                                    <v>728411</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>8</b>
+                                    <v>24</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36146,7 +36191,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>724033</v>
+                                    <v>728435</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36156,19 +36201,19 @@
         </relation>
         <relation>
             <name>stmt_decl_entry_bind</name>
-            <cardinality>724033</cardinality>
+            <cardinality>728504</cardinality>
             <columnsizes>
                 <e>
                     <k>stmt</k>
-                    <v>713534</v>
+                    <v>688131</v>
                 </e>
                 <e>
                     <k>num</k>
-                    <v>72</v>
+                    <v>125</v>
                 </e>
                 <e>
                     <k>decl_entry</k>
-                    <v>724033</v>
+                    <v>728504</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36182,12 +36227,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>706121</v>
+                                    <v>665975</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>10</b>
-                                    <v>7413</v>
+                                    <b>32</b>
+                                    <v>22156</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36203,12 +36248,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>706121</v>
+                                    <v>665975</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>10</b>
-                                    <v>7413</v>
+                                    <b>32</b>
+                                    <v>22156</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36222,48 +36267,53 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>14</a>
-                                    <b>15</b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>52</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>15</a>
-                                    <b>16</b>
+                                    <a>3</a>
+                                    <b>5</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>19</b>
+                                    <a>7</a>
+                                    <b>11</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>21</a>
-                                    <b>22</b>
+                                    <a>11</a>
+                                    <b>15</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>25</a>
-                                    <b>26</b>
+                                    <a>21</a>
+                                    <b>45</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>60</a>
-                                    <b>61</b>
+                                    <a>86</a>
+                                    <b>121</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>229</a>
-                                    <b>230</b>
+                                    <a>205</a>
+                                    <b>357</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>918</a>
-                                    <b>919</b>
+                                    <a>1067</a>
+                                    <b>2544</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>88354</a>
-                                    <b>88355</b>
+                                    <a>5483</a>
+                                    <b>170293</b>
                                     <v>8</v>
                                 </b>
                             </bs>
@@ -36278,48 +36328,53 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>14</a>
-                                    <b>15</b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>52</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>15</a>
-                                    <b>16</b>
+                                    <a>3</a>
+                                    <b>5</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>19</b>
+                                    <a>7</a>
+                                    <b>11</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>21</a>
-                                    <b>22</b>
+                                    <a>11</a>
+                                    <b>15</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>25</a>
-                                    <b>26</b>
+                                    <a>21</a>
+                                    <b>45</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>60</a>
-                                    <b>61</b>
+                                    <a>86</a>
+                                    <b>121</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>229</a>
-                                    <b>230</b>
+                                    <a>205</a>
+                                    <b>357</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>918</a>
-                                    <b>919</b>
+                                    <a>1067</a>
+                                    <b>2544</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>88354</a>
-                                    <b>88355</b>
+                                    <a>5483</a>
+                                    <b>170293</b>
                                     <v>8</v>
                                 </b>
                             </bs>
@@ -36336,7 +36391,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>724033</v>
+                                    <v>728504</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36352,7 +36407,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>724033</v>
+                                    <v>728504</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36362,15 +36417,15 @@
         </relation>
         <relation>
             <name>blockscope</name>
-            <cardinality>1614225</cardinality>
+            <cardinality>1625753</cardinality>
             <columnsizes>
                 <e>
                     <k>block</k>
-                    <v>1614225</v>
+                    <v>1625753</v>
                 </e>
                 <e>
                     <k>enclosing</k>
-                    <v>1400877</v>
+                    <v>1404746</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36384,7 +36439,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1614225</v>
+                                    <v>1625753</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36400,17 +36455,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1270635</v>
+                                    <v>1267599</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>115144</v>
+                                    <v>122045</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>29</b>
-                                    <v>15098</v>
+                                    <v>15102</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36420,19 +36475,19 @@
         </relation>
         <relation>
             <name>jumpinfo</name>
-            <cardinality>348275</cardinality>
+            <cardinality>348076</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>348275</v>
+                    <v>348076</v>
                 </e>
                 <e>
                     <k>str</k>
-                    <v>28944</v>
+                    <v>28928</v>
                 </e>
                 <e>
                     <k>target</k>
-                    <v>72696</v>
+                    <v>72655</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36446,7 +36501,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>348275</v>
+                                    <v>348076</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36462,7 +36517,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>348275</v>
+                                    <v>348076</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36478,32 +36533,32 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>13595</v>
+                                    <v>13587</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6058</v>
+                                    <v>6054</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>2013</v>
+                                    <v>2012</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>1888</v>
+                                    <v>1887</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>2197</v>
+                                    <v>2196</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>25</b>
-                                    <v>2189</v>
+                                    <v>2188</v>
                                 </b>
                                 <b>
                                     <a>25</a>
@@ -36524,17 +36579,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>23187</v>
+                                    <v>23174</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3626</v>
+                                    <v>3624</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>3321</b>
-                                    <v>2130</v>
+                                    <v>2129</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36555,27 +36610,27 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>36206</v>
+                                    <v>36185</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>17631</v>
+                                    <v>17620</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>7378</v>
+                                    <v>7374</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>6417</v>
+                                    <v>6413</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>2124</b>
-                                    <v>5030</v>
+                                    <v>5027</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36591,7 +36646,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>72696</v>
+                                    <v>72655</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36601,11 +36656,11 @@
         </relation>
         <relation>
             <name>preprocdirects</name>
-            <cardinality>5321789</cardinality>
+            <cardinality>5322959</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5321789</v>
+                    <v>5322959</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -36613,7 +36668,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5318720</v>
+                    <v>5319889</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36627,7 +36682,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5321789</v>
+                                    <v>5322959</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36643,7 +36698,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5321789</v>
+                                    <v>5322959</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36791,7 +36846,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5318597</v>
+                                    <v>5319766</v>
                                 </b>
                                 <b>
                                     <a>26</a>
@@ -36812,7 +36867,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5318720</v>
+                                    <v>5319889</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36822,15 +36877,15 @@
         </relation>
         <relation>
             <name>preprocpair</name>
-            <cardinality>1122961</cardinality>
+            <cardinality>1123207</cardinality>
             <columnsizes>
                 <e>
                     <k>begin</k>
-                    <v>874750</v>
+                    <v>874943</v>
                 </e>
                 <e>
                     <k>elseelifend</k>
-                    <v>1122961</v>
+                    <v>1123207</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36844,17 +36899,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>639184</v>
+                                    <v>639324</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>226728</v>
+                                    <v>226777</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>8838</v>
+                                    <v>8840</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36870,7 +36925,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1122961</v>
+                                    <v>1123207</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36880,41 +36935,41 @@
         </relation>
         <relation>
             <name>preproctrue</name>
-            <cardinality>432219</cardinality>
+            <cardinality>432314</cardinality>
             <columnsizes>
                 <e>
                     <k>branch</k>
-                    <v>432219</v>
+                    <v>432314</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>preprocfalse</name>
-            <cardinality>280740</cardinality>
+            <cardinality>280801</cardinality>
             <columnsizes>
                 <e>
                     <k>branch</k>
-                    <v>280740</v>
+                    <v>280801</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>preproctext</name>
-            <cardinality>4282669</cardinality>
+            <cardinality>4283611</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4282669</v>
+                    <v>4283611</v>
                 </e>
                 <e>
                     <k>head</k>
-                    <v>2907815</v>
+                    <v>2908455</v>
                 </e>
                 <e>
                     <k>body</k>
-                    <v>1656453</v>
+                    <v>1656817</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36928,7 +36983,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4282669</v>
+                                    <v>4283611</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36944,7 +36999,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4282669</v>
+                                    <v>4283611</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36960,12 +37015,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2712390</v>
+                                    <v>2712986</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>798</b>
-                                    <v>195425</v>
+                                    <v>195468</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36981,12 +37036,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2827902</v>
+                                    <v>2828524</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>79913</v>
+                                    <v>79930</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37002,17 +37057,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1510620</v>
+                                    <v>1510952</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>125209</v>
+                                    <v>125237</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>13605</b>
-                                    <v>20622</v>
+                                    <v>20627</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37028,17 +37083,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1514794</v>
+                                    <v>1515127</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>12</b>
-                                    <v>124841</v>
+                                    <v>124869</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>3246</b>
-                                    <v>16817</v>
+                                    <v>16821</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37048,15 +37103,15 @@
         </relation>
         <relation>
             <name>includes</name>
-            <cardinality>316459</cardinality>
+            <cardinality>322579</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>316459</v>
+                    <v>322579</v>
                 </e>
                 <e>
                     <k>included</k>
-                    <v>58294</v>
+                    <v>59421</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37070,7 +37125,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>316459</v>
+                                    <v>322579</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37086,37 +37141,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28848</v>
+                                    <v>29406</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9378</v>
+                                    <v>9559</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4919</v>
+                                    <v>5015</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>5318</v>
+                                    <v>5421</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>11</b>
-                                    <v>4489</v>
+                                    <v>4576</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>47</b>
-                                    <v>4374</v>
+                                    <v>4459</v>
                                 </b>
                                 <b>
                                     <a>47</a>
                                     <b>793</b>
-                                    <v>965</v>
+                                    <v>983</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37174,15 +37229,15 @@
         </relation>
         <relation>
             <name>link_targets</name>
-            <cardinality>817</cardinality>
+            <cardinality>816</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>817</v>
+                    <v>816</v>
                 </e>
                 <e>
                     <k>binary</k>
-                    <v>817</v>
+                    <v>816</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37196,7 +37251,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>817</v>
+                                    <v>816</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37212,7 +37267,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>817</v>
+                                    <v>816</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37222,15 +37277,15 @@
         </relation>
         <relation>
             <name>link_parent</name>
-            <cardinality>30993807</cardinality>
+            <cardinality>31164351</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
-                    <v>3938571</v>
+                    <v>3960481</v>
                 </e>
                 <e>
                     <k>link_target</k>
-                    <v>335</v>
+                    <v>337</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37244,17 +37299,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>537390</v>
+                                    <v>540607</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>9</b>
-                                    <v>27022</v>
+                                    <v>27182</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>3374158</v>
+                                    <v>3392691</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37273,48 +37328,48 @@
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>100775</a>
-                                    <b>100776</b>
+                                    <a>100732</a>
+                                    <b>100733</b>
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>100895</a>
-                                    <b>100896</b>
+                                    <a>100852</a>
+                                    <b>100853</b>
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>100953</a>
-                                    <b>100954</b>
+                                    <a>100910</a>
+                                    <b>100911</b>
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>100974</a>
-                                    <b>100975</b>
+                                    <a>100931</a>
+                                    <b>100932</b>
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>100996</a>
-                                    <b>100997</b>
+                                    <a>100953</a>
+                                    <b>100954</b>
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>101038</a>
-                                    <b>101039</b>
+                                    <a>100995</a>
+                                    <b>100996</b>
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>103041</a>
-                                    <b>103042</b>
+                                    <a>102998</a>
+                                    <b>102999</b>
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>106539</a>
-                                    <b>106540</b>
+                                    <a>106496</a>
+                                    <b>106497</b>
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>108099</a>
-                                    <b>108100</b>
+                                    <a>108057</a>
+                                    <b>108058</b>
                                     <v>33</v>
                                 </b>
                             </bs>