diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/Opcode.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/Opcode.qll
index c4134d240ab..b4def7fe4ae 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/Opcode.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/Opcode.qll
@@ -30,6 +30,7 @@ private newtype TOpcode =
   TNegate() or
   TShiftLeft() or
   TShiftRight() or
+  TUnsignedShiftRight() or
   TBitAnd() or
   TBitOr() or
   TBitXor() or
@@ -652,6 +653,15 @@ module Opcode {
     final override string toString() { result = "ShiftRight" }
   }
 
+  /**
+   * The `Opcode` for a `UnsignedShiftRightInstruction`.
+   *
+   * See the `UnsignedShiftRightInstruction` documentation for more details.
+   */
+  class UnsignedShiftRight extends BinaryBitwiseOpcode, TUnsignedShiftRight {
+    final override string toString() { result = "UnsignedShiftRight" }
+  }
+
   /**
    * The `Opcode` for a `BitAndInstruction`.
    *
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/Instruction.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/Instruction.qll
index 7afe954023b..0aa7c552638 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/Instruction.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/Instruction.qll
@@ -1204,6 +1204,17 @@ class ShiftRightInstruction extends BinaryBitwiseInstruction {
   ShiftRightInstruction() { this.getOpcode() instanceof Opcode::ShiftRight }
 }
 
+/**
+ * An instruction that shifts its left operand to the right by the number of bits specified by its
+ * right operand.
+ *
+ * Both operands must have an integer type. The result has the same type as the left operand.
+ * The leftmost bits are zero-filled.
+ */
+class UnsignedShiftRightInstruction extends BinaryBitwiseInstruction {
+  UnsignedShiftRightInstruction() { this.getOpcode() instanceof Opcode::UnsignedShiftRight }
+}
+
 /**
  * An instruction that performs a binary arithmetic operation involving at least one pointer
  * operand.
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/Instruction.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/Instruction.qll
index 7afe954023b..0aa7c552638 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/Instruction.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/Instruction.qll
@@ -1204,6 +1204,17 @@ class ShiftRightInstruction extends BinaryBitwiseInstruction {
   ShiftRightInstruction() { this.getOpcode() instanceof Opcode::ShiftRight }
 }
 
+/**
+ * An instruction that shifts its left operand to the right by the number of bits specified by its
+ * right operand.
+ *
+ * Both operands must have an integer type. The result has the same type as the left operand.
+ * The leftmost bits are zero-filled.
+ */
+class UnsignedShiftRightInstruction extends BinaryBitwiseInstruction {
+  UnsignedShiftRightInstruction() { this.getOpcode() instanceof Opcode::UnsignedShiftRight }
+}
+
 /**
  * An instruction that performs a binary arithmetic operation involving at least one pointer
  * operand.
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/Instruction.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/Instruction.qll
index 7afe954023b..0aa7c552638 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/Instruction.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/Instruction.qll
@@ -1204,6 +1204,17 @@ class ShiftRightInstruction extends BinaryBitwiseInstruction {
   ShiftRightInstruction() { this.getOpcode() instanceof Opcode::ShiftRight }
 }
 
+/**
+ * An instruction that shifts its left operand to the right by the number of bits specified by its
+ * right operand.
+ *
+ * Both operands must have an integer type. The result has the same type as the left operand.
+ * The leftmost bits are zero-filled.
+ */
+class UnsignedShiftRightInstruction extends BinaryBitwiseInstruction {
+  UnsignedShiftRightInstruction() { this.getOpcode() instanceof Opcode::UnsignedShiftRight }
+}
+
 /**
  * An instruction that performs a binary arithmetic operation involving at least one pointer
  * operand.
diff --git a/csharp/downgrades/d0fba103f7dee477dd7d9f6c038518b3f683b2c7/expressions.ql b/csharp/downgrades/d0fba103f7dee477dd7d9f6c038518b3f683b2c7/expressions.ql
new file mode 100644
index 00000000000..6afabce797e
--- /dev/null
+++ b/csharp/downgrades/d0fba103f7dee477dd7d9f6c038518b3f683b2c7/expressions.ql
@@ -0,0 +1,13 @@
+class Expression extends @expr {
+  string toString() { none() }
+}
+
+class TypeOrRef extends @type_or_ref {
+  string toString() { none() }
+}
+
+from Expression e, int k, int kind, TypeOrRef t
+where
+  expressions(e, k, t) and
+  if k = [133, 134] then kind = 106 else kind = k
+select e, kind, t
diff --git a/csharp/downgrades/d0fba103f7dee477dd7d9f6c038518b3f683b2c7/old.dbscheme b/csharp/downgrades/d0fba103f7dee477dd7d9f6c038518b3f683b2c7/old.dbscheme
new file mode 100644
index 00000000000..d0fba103f7d
--- /dev/null
+++ b/csharp/downgrades/d0fba103f7dee477dd7d9f6c038518b3f683b2c7/old.dbscheme
@@ -0,0 +1,2069 @@
+/* This is a dummy line to alter the dbscheme, so we can make a database upgrade
+ * without actually changing any of the dbscheme predicates. It contains a date
+ * to allow for such updates in the future as well.
+ *
+ * 2021-07-14
+ *
+ * DO NOT remove this comment carelessly, since it can revert the dbscheme back to a
+ * previously seen state (matching a previously seen SHA), which would make the upgrade
+ * mechanism not work properly.
+ */
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    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
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | --compiler
+ * 1   | *path to compiler*
+ * 2   | f1.cs
+ * 3   | f2.cs
+ * 4   | f3.cs
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.cs
+ * 1   | f2.cs
+ * 2   | f3.cs
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The references used by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs /r:ref1.dll /r:ref2.dll /r:ref3.dll
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | ref1.dll
+ * 1   | ref2.dll
+ * 2   | ref3.dll
+ */
+#keyset[id, num]
+compilation_referencing_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(
+    unique int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location_default ref
+);
+
+extractor_messages(
+    unique int id: @extractor_message,
+    int severity: int ref,
+    string origin : string ref,
+    string text : string ref,
+    string entity : string ref,
+    int location: @location_default ref,
+    string stack_trace : string 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
+);
+
+compilation_assembly(
+  unique int id : @compilation ref,
+  int assembly: @assembly ref
+)
+
+// Populated by the CSV extractor
+externalData(
+   int id: @externalDataElement,
+   string path: string ref,
+   int column: int ref,
+   string value: string ref);
+
+sourceLocationPrefix(
+  string prefix: string ref);
+
+/*
+ * C# dbscheme
+ */
+
+/** ELEMENTS **/
+
+@element = @declaration | @stmt | @expr | @modifier | @attribute | @namespace_declaration
+         | @using_directive | @type_parameter_constraints | @externalDataElement
+         | @xmllocatable | @asp_element | @namespace | @preprocessor_directive;
+
+@declaration = @callable | @generic | @assignable | @namespace;
+
+@named_element = @namespace | @declaration;
+
+@declaration_with_accessors = @property | @indexer | @event;
+
+@assignable = @variable | @assignable_with_accessors | @event;
+
+@assignable_with_accessors = @property | @indexer;
+
+@attributable = @assembly | @field | @parameter | @operator | @method | @constructor
+              | @destructor | @callable_accessor | @value_or_ref_type | @declaration_with_accessors
+              | @local_function | @lambda_expr;
+
+/** LOCATIONS, ASEMMBLIES, MODULES, FILES and FOLDERS **/
+
+@location = @location_default | @assembly;
+
+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);
+
+locations_mapped(
+  unique int id: @location_default ref,
+  int mapped_to: @location_default ref);
+
+@sourceline = @file | @callable | @xmllocatable;
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref);
+
+assemblies(
+  unique int id: @assembly,
+  int file: @file ref,
+  string fullname: string ref,
+  string name: string ref,
+  string version: string ref);
+
+files(
+  unique int id: @file,
+  string name: string ref);
+
+folders(
+  unique int id: @folder,
+  string name: string ref);
+
+@container = @folder | @file ;
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref);
+
+file_extraction_mode(
+  unique int file: @file ref,
+  int mode: int ref
+  /* 0 = normal, 1 = standalone extractor */
+  );
+
+/** NAMESPACES **/
+
+@type_container = @namespace | @type;
+
+namespaces(
+  unique int id: @namespace,
+  string name: string ref);
+
+namespace_declarations(
+  unique int id: @namespace_declaration,
+  int namespace_id: @namespace ref);
+
+namespace_declaration_location(
+  unique int id: @namespace_declaration ref,
+  int loc: @location ref);
+
+parent_namespace(
+  unique int child_id: @type_container ref,
+  int namespace_id: @namespace ref);
+
+@declaration_or_directive = @namespace_declaration | @type | @using_directive;
+
+parent_namespace_declaration(
+  int child_id: @declaration_or_directive ref, // cannot be unique because of partial classes
+  int namespace_id: @namespace_declaration ref);
+
+@using_directive = @using_namespace_directive | @using_static_directive;
+
+using_global(
+  unique int id: @using_directive ref
+);
+
+using_namespace_directives(
+  unique int id: @using_namespace_directive,
+  int namespace_id: @namespace ref);
+
+using_static_directives(
+  unique int id: @using_static_directive,
+  int type_id: @type_or_ref ref);
+
+using_directive_location(
+  unique int id: @using_directive ref,
+  int loc: @location ref);
+
+@preprocessor_directive = @pragma_warning | @pragma_checksum | @directive_define | @directive_undefine | @directive_warning
+  | @directive_error | @directive_nullable | @directive_line | @directive_region | @directive_endregion | @directive_if
+  | @directive_elif | @directive_else | @directive_endif;
+
+@conditional_directive = @directive_if | @directive_elif;
+@branch_directive = @directive_if | @directive_elif | @directive_else;
+
+directive_ifs(
+  unique int id: @directive_if,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref); /* 0: false, 1: true */
+
+directive_elifs(
+  unique int id: @directive_elif,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref,  /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+directive_elses(
+  unique int id: @directive_else,
+  int branchTaken: int ref,   /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+#keyset[id, start]
+directive_endifs(
+  unique int id: @directive_endif,
+  unique int start: @directive_if ref);
+
+directive_define_symbols(
+  unique int id: @define_symbol_expr ref,
+  string name: string ref);
+
+directive_regions(
+  unique int id: @directive_region,
+  string name: string ref);
+
+#keyset[id, start]
+directive_endregions(
+  unique int id: @directive_endregion,
+  unique int start: @directive_region ref);
+
+directive_lines(
+  unique int id: @directive_line,
+  int kind: int ref); /* 0: default, 1: hidden, 2: numeric, 3: span */
+
+directive_line_value(
+  unique int id: @directive_line ref,
+  int line: int ref);
+
+directive_line_file(
+  unique int id: @directive_line ref,
+  int file: @file ref);
+
+directive_line_offset(
+  unique int id: @directive_line ref,
+  int offset: int ref);
+
+directive_line_span(
+  unique int id: @directive_line ref,
+  int startLine: int ref,
+  int startColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref);
+
+directive_nullables(
+  unique int id: @directive_nullable,
+  int setting: int ref, /* 0: disable, 1: enable, 2: restore */
+  int target: int ref); /* 0: none, 1: annotations, 2: warnings */
+
+directive_warnings(
+  unique int id: @directive_warning,
+  string message: string ref);
+
+directive_errors(
+  unique int id: @directive_error,
+  string message: string ref);
+
+directive_undefines(
+  unique int id: @directive_undefine,
+  string name: string ref);
+
+directive_defines(
+  unique int id: @directive_define,
+  string name: string ref);
+
+pragma_checksums(
+  unique int id: @pragma_checksum,
+  int file: @file ref,
+  string guid: string ref,
+  string bytes: string ref);
+
+pragma_warnings(
+  unique int id: @pragma_warning,
+  int kind: int ref /* 0 = disable, 1 = restore */);
+
+#keyset[id, index]
+pragma_warning_error_codes(
+  int id: @pragma_warning ref,
+  string errorCode: string ref,
+  int index: int ref);
+
+preprocessor_directive_location(
+  unique int id: @preprocessor_directive ref,
+  int loc: @location ref);
+
+preprocessor_directive_compilation(
+  unique int id: @preprocessor_directive ref,
+  int compilation: @compilation ref);
+
+preprocessor_directive_active(
+  unique int id: @preprocessor_directive ref,
+  int active: int ref);  /* 0: false, 1: true */
+
+/** TYPES **/
+
+types(
+  unique int id: @type,
+  int kind: int ref,
+  string name: string ref);
+
+case @type.kind of
+   1 = @bool_type
+|  2 = @char_type
+|  3 = @decimal_type
+|  4 = @sbyte_type
+|  5 = @short_type
+|  6 = @int_type
+|  7 = @long_type
+|  8 = @byte_type
+|  9 = @ushort_type
+| 10 = @uint_type
+| 11 = @ulong_type
+| 12 = @float_type
+| 13 = @double_type
+| 14 = @enum_type
+| 15 = @struct_type
+| 17 = @class_type
+| 19 = @interface_type
+| 20 = @delegate_type
+| 21 = @null_type
+| 22 = @type_parameter
+| 23 = @pointer_type
+| 24 = @nullable_type
+| 25 = @array_type
+| 26 = @void_type
+| 27 = @int_ptr_type
+| 28 = @uint_ptr_type
+| 29 = @dynamic_type
+| 30 = @arglist_type
+| 31 = @unknown_type
+| 32 = @tuple_type
+| 33 = @function_pointer_type
+  ;
+
+@simple_type = @bool_type | @char_type | @integral_type | @floating_point_type | @decimal_type;
+@integral_type = @signed_integral_type | @unsigned_integral_type;
+@signed_integral_type = @sbyte_type | @short_type | @int_type | @long_type;
+@unsigned_integral_type = @byte_type  | @ushort_type | @uint_type | @ulong_type;
+@floating_point_type = @float_type | @double_type;
+@value_type = @simple_type | @enum_type | @struct_type | @nullable_type | @int_ptr_type
+            | @uint_ptr_type | @tuple_type;
+@ref_type = @class_type | @interface_type | @array_type | @delegate_type | @null_type
+          | @dynamic_type;
+@value_or_ref_type = @value_type | @ref_type;
+
+typerefs(
+  unique int id: @typeref,
+  string name: string ref);
+
+typeref_type(
+  int id: @typeref ref,
+  unique int typeId: @type ref);
+
+@type_or_ref = @type | @typeref;
+
+array_element_type(
+  unique int array: @array_type ref,
+  int dimension: int ref,
+  int rank: int ref,
+  int element: @type_or_ref ref);
+
+nullable_underlying_type(
+  unique int nullable: @nullable_type ref,
+  int underlying: @type_or_ref ref);
+
+pointer_referent_type(
+  unique int pointer: @pointer_type ref,
+  int referent: @type_or_ref ref);
+
+enum_underlying_type(
+  unique int enum_id: @enum_type ref,
+  int underlying_type_id: @type_or_ref ref);
+
+delegate_return_type(
+  unique int delegate_id: @delegate_type ref,
+  int return_type_id: @type_or_ref ref);
+
+function_pointer_return_type(
+    unique int function_pointer_id: @function_pointer_type ref,
+    int return_type_id: @type_or_ref ref);
+
+extend(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+anonymous_types(
+  unique int id: @type ref);
+
+@interface_or_ref = @interface_type | @typeref;
+
+implement(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+type_location(
+  int id: @type ref,
+  int loc: @location ref);
+
+tuple_underlying_type(
+  unique int tuple: @tuple_type ref,
+  int struct: @type_or_ref ref);
+
+#keyset[tuple, index]
+tuple_element(
+  int tuple: @tuple_type ref,
+  int index: int ref,
+  unique int field: @field ref);
+
+attributes(
+  unique int id: @attribute,
+  int kind: int ref,
+  int type_id: @type_or_ref ref,
+  int target:  @attributable ref);
+
+case @attribute.kind of
+  0 = @attribute_default
+| 1 = @attribute_return
+| 2 = @attribute_assembly
+| 3 = @attribute_module
+;
+
+attribute_location(
+  int id: @attribute ref,
+  int loc: @location ref);
+
+@type_mention_parent = @element | @type_mention;
+
+type_mention(
+  unique int id: @type_mention,
+  int type_id: @type_or_ref ref,
+  int parent: @type_mention_parent ref);
+
+type_mention_location(
+  unique int id: @type_mention ref,
+  int loc: @location ref);
+
+@has_type_annotation = @assignable | @type_parameter | @callable | @expr | @delegate_type | @generic | @function_pointer_type;
+
+/**
+ * A direct annotation on an entity, for example `string? x;`.
+ *
+ * Annotations:
+ * 2 = reftype is not annotated "!"
+ * 3 = reftype is annotated "?"
+ * 4 = readonly ref type / in parameter
+ * 5 = ref type parameter, return or local variable
+ * 6 = out parameter
+ *
+ * Note that the annotation depends on the element it annotates.
+ * @assignable: The annotation is on the type of the assignable, for example the variable type.
+ * @type_parameter: The annotation is on the reftype constraint
+ * @callable: The annotation is on the return type
+ * @array_type: The annotation is on the element type
+ */
+type_annotation(int id: @has_type_annotation ref, int annotation: int ref);
+
+nullability(unique int nullability: @nullability, int kind: int ref);
+
+case @nullability.kind of
+  0 = @oblivious
+| 1 = @not_annotated
+| 2 = @annotated
+;
+
+#keyset[parent, index]
+nullability_parent(int nullability: @nullability ref, int index: int ref, int parent: @nullability ref)
+
+type_nullability(int id: @has_type_annotation ref, int nullability: @nullability ref);
+
+/**
+ * The nullable flow state of an expression, as determined by Roslyn.
+ *   0 = none (default, not populated)
+ *   1 = not null
+ *   2 = maybe null
+ */
+expr_flowstate(unique int id: @expr ref, int state: int ref);
+
+/** GENERICS **/
+
+@generic = @type | @method | @local_function;
+
+type_parameters(
+  unique int id: @type_parameter ref,
+  int index: int ref,
+  int generic_id: @generic ref,
+  int variance: int ref /* none = 0, out = 1, in = 2 */);
+
+#keyset[constructed_id, index]
+type_arguments(
+  int id: @type_or_ref ref,
+  int index: int ref,
+  int constructed_id: @generic_or_ref ref);
+
+@generic_or_ref = @generic | @typeref;
+
+constructed_generic(
+  unique int constructed: @generic ref,
+  int generic: @generic_or_ref ref);
+
+type_parameter_constraints(
+  unique int id: @type_parameter_constraints,
+  int param_id: @type_parameter ref);
+
+type_parameter_constraints_location(
+  int id: @type_parameter_constraints ref,
+  int loc: @location ref);
+
+general_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int kind: int ref /* class = 1, struct = 2, new = 3 */);
+
+specific_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref);
+
+specific_type_parameter_nullability(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref,
+  int nullability: @nullability ref);
+
+/** FUNCTION POINTERS */
+
+function_pointer_calling_conventions(
+  int id: @function_pointer_type ref,
+  int kind: int ref);
+
+#keyset[id, index]
+has_unmanaged_calling_conventions(
+  int id: @function_pointer_type ref,
+  int index: int ref,
+  int conv_id: @type_or_ref ref);
+
+/** MODIFIERS */
+
+@modifiable = @modifiable_direct | @event_accessor;
+
+@modifiable_direct = @member | @accessor | @local_function | @anonymous_function_expr;
+
+modifiers(
+  unique int id: @modifier,
+  string name: string ref);
+
+has_modifiers(
+  int id: @modifiable_direct ref,
+  int mod_id: @modifier ref);
+
+compiler_generated(unique int id: @modifiable ref);
+
+/** MEMBERS **/
+
+@member = @method | @constructor | @destructor | @field | @property | @event | @operator | @indexer | @type;
+
+@named_exprorstmt = @goto_stmt | @labeled_stmt | @expr;
+
+@virtualizable = @method | @property | @indexer | @event;
+
+exprorstmt_name(
+  unique int parent_id: @named_exprorstmt ref,
+  string name: string ref);
+
+nested_types(
+  unique int id: @type ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @type ref);
+
+properties(
+  unique int id: @property,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @property ref);
+
+property_location(
+  int id: @property ref,
+  int loc: @location ref);
+
+indexers(
+  unique int id: @indexer,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @indexer ref);
+
+indexer_location(
+  int id: @indexer ref,
+  int loc: @location ref);
+
+accessors(
+  unique int id: @accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_member_id: @member ref,
+  int unbound_id: @accessor ref);
+
+case @accessor.kind of
+  1 = @getter
+| 2 = @setter
+  ;
+
+init_only_accessors(
+  unique int id: @accessor ref);
+
+accessor_location(
+  int id: @accessor ref,
+  int loc: @location ref);
+
+events(
+  unique int id: @event,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @event ref);
+
+event_location(
+  int id: @event ref,
+  int loc: @location ref);
+
+event_accessors(
+  unique int id: @event_accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_event_id: @event ref,
+  int unbound_id: @event_accessor ref);
+
+case @event_accessor.kind of
+  1 = @add_event_accessor
+| 2 = @remove_event_accessor
+  ;
+
+event_accessor_location(
+  int id: @event_accessor ref,
+  int loc: @location ref);
+
+operators(
+  unique int id: @operator,
+  string name: string ref,
+  string symbol: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @operator ref);
+
+operator_location(
+  int id: @operator ref,
+  int loc: @location ref);
+
+constant_value(
+  int id: @variable ref,
+  string value: string ref);
+
+/** CALLABLES **/
+
+@callable = @method | @constructor | @destructor | @operator | @callable_accessor | @anonymous_function_expr | @local_function;
+
+@callable_accessor = @accessor | @event_accessor;
+
+methods(
+  unique int id: @method,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @method ref);
+
+method_location(
+  int id: @method ref,
+  int loc: @location ref);
+
+constructors(
+  unique int id: @constructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @constructor ref);
+
+constructor_location(
+  int id: @constructor ref,
+  int loc: @location ref);
+
+destructors(
+  unique int id: @destructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @destructor ref);
+
+destructor_location(
+  int id: @destructor ref,
+  int loc: @location ref);
+
+overrides(
+  int id: @callable ref,
+  int base_id: @callable ref);
+
+explicitly_implements(
+  int id: @member ref,
+  int interface_id: @interface_or_ref ref);
+
+local_functions(
+    unique int id: @local_function,
+    string name: string ref,
+    int return_type: @type ref,
+    int unbound_id: @local_function ref);
+
+local_function_stmts(
+    unique int fn: @local_function_stmt ref,
+    int stmt: @local_function ref);
+
+/** VARIABLES **/
+
+@variable = @local_scope_variable | @field;
+
+@local_scope_variable = @local_variable | @parameter;
+
+fields(
+  unique int id: @field,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @field ref);
+
+case @field.kind of
+  1 = @addressable_field
+| 2 = @constant
+  ;
+
+field_location(
+  int id: @field ref,
+  int loc: @location ref);
+
+localvars(
+  unique int id: @local_variable,
+  int kind: int ref,
+  string name: string ref,
+  int implicitly_typed: int ref /* 0 = no, 1 = yes */,
+  int type_id: @type_or_ref ref,
+  int parent_id: @local_var_decl_expr ref);
+
+case @local_variable.kind of
+  1 = @addressable_local_variable
+| 2 = @local_constant
+| 3 = @local_variable_ref
+  ;
+
+localvar_location(
+  unique int id: @local_variable ref,
+  int loc: @location ref);
+
+@parameterizable = @callable | @delegate_type | @indexer | @function_pointer_type;
+
+#keyset[name, parent_id]
+#keyset[index, parent_id]
+params(
+  unique int id: @parameter,
+  string name: string ref,
+  int type_id: @type_or_ref ref,
+  int index: int ref,
+  int mode: int ref, /* value = 0, ref = 1, out = 2, array = 3, this = 4 */
+  int parent_id: @parameterizable ref,
+  int unbound_id: @parameter ref);
+
+param_location(
+  int id: @parameter ref,
+  int loc: @location ref);
+
+/** STATEMENTS **/
+
+@exprorstmt_parent = @control_flow_element | @top_level_exprorstmt_parent;
+
+statements(
+  unique int id: @stmt,
+  int kind: int ref);
+
+#keyset[index, parent]
+stmt_parent(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_stmt_parent = @callable;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+stmt_parent_top_level(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @top_level_stmt_parent ref);
+
+case @stmt.kind of
+   1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @switch_stmt
+|  5 = @while_stmt
+|  6 = @do_stmt
+|  7 = @for_stmt
+|  8 = @foreach_stmt
+|  9 = @break_stmt
+| 10 = @continue_stmt
+| 11 = @goto_stmt
+| 12 = @goto_case_stmt
+| 13 = @goto_default_stmt
+| 14 = @throw_stmt
+| 15 = @return_stmt
+| 16 = @yield_stmt
+| 17 = @try_stmt
+| 18 = @checked_stmt
+| 19 = @unchecked_stmt
+| 20 = @lock_stmt
+| 21 = @using_block_stmt
+| 22 = @var_decl_stmt
+| 23 = @const_decl_stmt
+| 24 = @empty_stmt
+| 25 = @unsafe_stmt
+| 26 = @fixed_stmt
+| 27 = @label_stmt
+| 28 = @catch
+| 29 = @case_stmt
+| 30 = @local_function_stmt
+| 31 = @using_decl_stmt
+  ;
+
+@using_stmt = @using_block_stmt | @using_decl_stmt;
+
+@labeled_stmt = @label_stmt | @case;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @using_decl_stmt;
+
+@cond_stmt = @if_stmt | @switch_stmt;
+
+@loop_stmt = @while_stmt | @do_stmt | @for_stmt | @foreach_stmt;
+
+@jump_stmt = @break_stmt | @goto_any_stmt | @continue_stmt | @throw_stmt | @return_stmt
+           | @yield_stmt;
+
+@goto_any_stmt = @goto_default_stmt | @goto_case_stmt | @goto_stmt;
+
+
+stmt_location(
+  unique int id: @stmt ref,
+  int loc: @location ref);
+
+catch_type(
+  unique int catch_id: @catch ref,
+  int type_id: @type_or_ref ref,
+  int kind: int ref /* explicit = 1, implicit = 2 */);
+
+foreach_stmt_info(
+  unique int id: @foreach_stmt ref,
+  int kind: int ref /* non-async = 1, async = 2 */);
+
+@foreach_symbol =  @method | @property | @type_or_ref;
+
+#keyset[id, kind]
+foreach_stmt_desugar(
+  int id: @foreach_stmt ref,
+  int symbol: @foreach_symbol ref,
+  int kind: int ref /* GetEnumeratorMethod = 1, CurrentProperty = 2, MoveNextMethod = 3, DisposeMethod = 4, ElementType = 5 */);
+
+/** EXPRESSIONS **/
+
+expressions(
+  unique int id: @expr,
+  int kind: int ref,
+  int type_id: @type_or_ref ref);
+
+#keyset[index, parent]
+expr_parent(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_expr_parent = @attribute | @field | @property | @indexer | @parameter | @directive_if | @directive_elif;
+
+@top_level_exprorstmt_parent = @top_level_expr_parent | @top_level_stmt_parent;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+expr_parent_top_level(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @top_level_exprorstmt_parent ref);
+
+case @expr.kind of
+/* literal */
+   1 = @bool_literal_expr
+|  2 = @char_literal_expr
+|  3 = @decimal_literal_expr
+|  4 = @int_literal_expr
+|  5 = @long_literal_expr
+|  6 = @uint_literal_expr
+|  7 = @ulong_literal_expr
+|  8 = @float_literal_expr
+|  9 = @double_literal_expr
+| 10 = @string_literal_expr
+| 11 = @null_literal_expr
+/* primary & unary */
+| 12 = @this_access_expr
+| 13 = @base_access_expr
+| 14 = @local_variable_access_expr
+| 15 = @parameter_access_expr
+| 16 = @field_access_expr
+| 17 = @property_access_expr
+| 18 = @method_access_expr
+| 19 = @event_access_expr
+| 20 = @indexer_access_expr
+| 21 = @array_access_expr
+| 22 = @type_access_expr
+| 23 = @typeof_expr
+| 24 = @method_invocation_expr
+| 25 = @delegate_invocation_expr
+| 26 = @operator_invocation_expr
+| 27 = @cast_expr
+| 28 = @object_creation_expr
+| 29 = @explicit_delegate_creation_expr
+| 30 = @implicit_delegate_creation_expr
+| 31 = @array_creation_expr
+| 32 = @default_expr
+| 33 = @plus_expr
+| 34 = @minus_expr
+| 35 = @bit_not_expr
+| 36 = @log_not_expr
+| 37 = @post_incr_expr
+| 38 = @post_decr_expr
+| 39 = @pre_incr_expr
+| 40 = @pre_decr_expr
+/* multiplicative */
+| 41 = @mul_expr
+| 42 = @div_expr
+| 43 = @rem_expr
+/* additive */
+| 44 = @add_expr
+| 45 = @sub_expr
+/* shift */
+| 46 = @lshift_expr
+| 47 = @rshift_expr
+/* relational */
+| 48 = @lt_expr
+| 49 = @gt_expr
+| 50 = @le_expr
+| 51 = @ge_expr
+/* equality */
+| 52 = @eq_expr
+| 53 = @ne_expr
+/* logical */
+| 54 = @bit_and_expr
+| 55 = @bit_xor_expr
+| 56 = @bit_or_expr
+| 57 = @log_and_expr
+| 58 = @log_or_expr
+/* type testing */
+| 59 = @is_expr
+| 60 = @as_expr
+/* null coalescing */
+| 61 = @null_coalescing_expr
+/* conditional */
+| 62 = @conditional_expr
+/* assignment */
+| 63 = @simple_assign_expr
+| 64 = @assign_add_expr
+| 65 = @assign_sub_expr
+| 66 = @assign_mul_expr
+| 67 = @assign_div_expr
+| 68 = @assign_rem_expr
+| 69 = @assign_and_expr
+| 70 = @assign_xor_expr
+| 71 = @assign_or_expr
+| 72 = @assign_lshift_expr
+| 73 = @assign_rshift_expr
+/* more */
+| 74 = @object_init_expr
+| 75 = @collection_init_expr
+| 76 = @array_init_expr
+| 77 = @checked_expr
+| 78 = @unchecked_expr
+| 79 = @constructor_init_expr
+| 80 = @add_event_expr
+| 81 = @remove_event_expr
+| 82 = @par_expr
+| 83 = @local_var_decl_expr
+| 84 = @lambda_expr
+| 85 = @anonymous_method_expr
+| 86 = @namespace_expr
+/* dynamic */
+| 92 = @dynamic_element_access_expr
+| 93 = @dynamic_member_access_expr
+/* unsafe */
+| 100 = @pointer_indirection_expr
+| 101 = @address_of_expr
+| 102 = @sizeof_expr
+/* async */
+| 103 = @await_expr
+/* C# 6.0 */
+| 104 = @nameof_expr
+| 105 = @interpolated_string_expr
+| 106 = @unknown_expr
+/* C# 7.0 */
+| 107 = @throw_expr
+| 108 = @tuple_expr
+| 109 = @local_function_invocation_expr
+| 110 = @ref_expr
+| 111 = @discard_expr
+/* C# 8.0 */
+| 112 = @range_expr
+| 113 = @index_expr
+| 114 = @switch_expr
+| 115 = @recursive_pattern_expr
+| 116 = @property_pattern_expr
+| 117 = @positional_pattern_expr
+| 118 = @switch_case_expr
+| 119 = @assign_coalesce_expr
+| 120 = @suppress_nullable_warning_expr
+| 121 = @namespace_access_expr
+/* C# 9.0 */
+| 122 = @lt_pattern_expr
+| 123 = @gt_pattern_expr
+| 124 = @le_pattern_expr
+| 125 = @ge_pattern_expr
+| 126 = @not_pattern_expr
+| 127 = @and_pattern_expr
+| 128 = @or_pattern_expr
+| 129 = @function_pointer_invocation_expr
+| 130 = @with_expr
+/* C# 11.0 */
+| 131 = @list_pattern_expr
+| 132 = @slice_pattern_expr
+| 133 = @urshift_expr
+| 134 = @assign_urshift_expr
+/* Preprocessor */
+| 999 = @define_symbol_expr
+;
+
+@switch = @switch_stmt | @switch_expr;
+@case = @case_stmt | @switch_case_expr;
+@pattern_match = @case | @is_expr;
+@unary_pattern_expr = @not_pattern_expr;
+@relational_pattern_expr = @gt_pattern_expr | @lt_pattern_expr | @ge_pattern_expr | @le_pattern_expr;
+@binary_pattern_expr = @and_pattern_expr | @or_pattern_expr;
+
+@integer_literal_expr = @int_literal_expr | @long_literal_expr | @uint_literal_expr | @ulong_literal_expr;
+@real_literal_expr = @float_literal_expr | @double_literal_expr | @decimal_literal_expr;
+@literal_expr = @bool_literal_expr | @char_literal_expr | @integer_literal_expr | @real_literal_expr
+              | @string_literal_expr | @null_literal_expr;
+
+@assign_expr = @simple_assign_expr | @assign_op_expr | @local_var_decl_expr;
+@assign_op_expr =  @assign_arith_expr | @assign_bitwise_expr | @assign_event_expr | @assign_coalesce_expr;
+@assign_event_expr = @add_event_expr | @remove_event_expr;
+
+@assign_arith_expr = @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr
+                   | @assign_rem_expr
+@assign_bitwise_expr = @assign_and_expr | @assign_or_expr | @assign_xor_expr
+                   | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr;
+
+@member_access_expr = @field_access_expr | @property_access_expr | @indexer_access_expr | @event_access_expr
+                    | @method_access_expr | @type_access_expr | @dynamic_member_access_expr;
+@access_expr = @member_access_expr | @this_access_expr | @base_access_expr | @assignable_access_expr | @namespace_access_expr;
+@element_access_expr = @indexer_access_expr | @array_access_expr | @dynamic_element_access_expr;
+
+@local_variable_access = @local_variable_access_expr | @local_var_decl_expr;
+@local_scope_variable_access_expr = @parameter_access_expr | @local_variable_access;
+@variable_access_expr = @local_scope_variable_access_expr | @field_access_expr;
+
+@assignable_access_expr = @variable_access_expr | @property_access_expr | @element_access_expr
+                        | @event_access_expr | @dynamic_member_access_expr;
+
+@objectorcollection_init_expr = @object_init_expr | @collection_init_expr;
+
+@delegate_creation_expr = @explicit_delegate_creation_expr | @implicit_delegate_creation_expr;
+
+@bin_arith_op_expr = @mul_expr | @div_expr | @rem_expr | @add_expr | @sub_expr;
+@incr_op_expr =  @pre_incr_expr | @post_incr_expr;
+@decr_op_expr =  @pre_decr_expr | @post_decr_expr;
+@mut_op_expr = @incr_op_expr | @decr_op_expr;
+@un_arith_op_expr = @plus_expr | @minus_expr | @mut_op_expr;
+@arith_op_expr = @bin_arith_op_expr | @un_arith_op_expr;
+
+@ternary_log_op_expr = @conditional_expr;
+@bin_log_op_expr = @log_and_expr | @log_or_expr | @null_coalescing_expr;
+@un_log_op_expr = @log_not_expr;
+@log_expr = @un_log_op_expr | @bin_log_op_expr | @ternary_log_op_expr;
+
+@bin_bit_op_expr =  @bit_and_expr | @bit_or_expr | @bit_xor_expr | @lshift_expr
+                 | @rshift_expr | @urshift_expr;
+@un_bit_op_expr = @bit_not_expr;
+@bit_expr = @un_bit_op_expr | @bin_bit_op_expr;
+
+@equality_op_expr =  @eq_expr | @ne_expr;
+@rel_op_expr = @gt_expr | @lt_expr| @ge_expr | @le_expr;
+@comp_expr = @equality_op_expr | @rel_op_expr;
+
+@op_expr = @assign_expr | @un_op | @bin_op | @ternary_op;
+
+@ternary_op = @ternary_log_op_expr;
+@bin_op = @bin_arith_op_expr | @bin_log_op_expr | @bin_bit_op_expr | @comp_expr;
+@un_op = @un_arith_op_expr | @un_log_op_expr | @un_bit_op_expr | @sizeof_expr
+       | @pointer_indirection_expr | @address_of_expr;
+
+@anonymous_function_expr = @lambda_expr | @anonymous_method_expr;
+
+@call = @method_invocation_expr | @constructor_init_expr | @operator_invocation_expr
+      | @delegate_invocation_expr | @object_creation_expr | @call_access_expr
+      | @local_function_invocation_expr | @function_pointer_invocation_expr;
+
+@call_access_expr = @property_access_expr | @event_access_expr | @indexer_access_expr;
+
+@late_bindable_expr = @dynamic_element_access_expr | @dynamic_member_access_expr
+                    | @object_creation_expr | @method_invocation_expr | @operator_invocation_expr;
+
+@throw_element = @throw_expr | @throw_stmt;
+
+@implicitly_typeable_object_creation_expr = @object_creation_expr | @explicit_delegate_creation_expr;
+
+implicitly_typed_array_creation(
+  unique int id: @array_creation_expr ref);
+
+explicitly_sized_array_creation(
+  unique int id: @array_creation_expr ref);
+
+stackalloc_array_creation(
+  unique int id: @array_creation_expr ref);
+
+implicitly_typed_object_creation(
+  unique int id: @implicitly_typeable_object_creation_expr ref);
+
+mutator_invocation_mode(
+  unique int id: @operator_invocation_expr ref,
+  int mode: int ref /* prefix = 1, postfix = 2*/);
+
+expr_compiler_generated(
+  unique int id: @expr ref);
+
+expr_value(
+  unique int id: @expr ref,
+  string value: string ref);
+
+expr_call(
+  unique int caller_id: @expr ref,
+  int target_id: @callable ref);
+
+expr_access(
+  unique int accesser_id: @access_expr ref,
+  int target_id: @accessible ref);
+
+@accessible = @method | @assignable | @local_function | @namespace;
+
+expr_location(
+  unique int id: @expr ref,
+  int loc: @location ref);
+
+dynamic_member_name(
+  unique int id: @late_bindable_expr ref,
+  string name: string ref);
+
+@qualifiable_expr = @member_access_expr
+                  | @method_invocation_expr
+                  | @element_access_expr;
+
+conditional_access(
+  unique int id: @qualifiable_expr ref);
+
+expr_argument(
+  unique int id: @expr ref,
+  int mode: int ref);
+  /* mode is the same as params: value = 0, ref = 1, out = 2 */
+
+expr_argument_name(
+  unique int id: @expr ref,
+  string name: string ref);
+
+lambda_expr_return_type(
+  unique int id: @lambda_expr ref,
+  int type_id: @type_or_ref ref);
+  
+/** CONTROL/DATA FLOW **/
+
+@control_flow_element = @stmt | @expr;
+
+/* 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;
+
+/* Comments */
+
+commentline(
+  unique int id: @commentline,
+  int kind: int ref,
+  string text: string ref,
+  string rawtext: string ref);
+
+case @commentline.kind of
+  0 = @singlelinecomment
+| 1 = @xmldoccomment
+| 2 = @multilinecomment;
+
+commentline_location(
+  unique int id: @commentline ref,
+  int loc: @location ref);
+
+commentblock(
+  unique int id : @commentblock);
+
+commentblock_location(
+  unique int id: @commentblock ref,
+  int loc: @location ref);
+
+commentblock_binding(
+  int id: @commentblock ref,
+  int entity: @element ref,
+  int bindtype: int ref);    /* 0: Parent, 1: Best, 2: Before, 3: After */
+
+commentblock_child(
+  int id: @commentblock ref,
+  int commentline: @commentline ref,
+  int index: int ref);
+
+/* ASP.NET */
+
+case @asp_element.kind of
+  0=@asp_close_tag
+| 1=@asp_code
+| 2=@asp_comment
+| 3=@asp_data_binding
+| 4=@asp_directive
+| 5=@asp_open_tag
+| 6=@asp_quoted_string
+| 7=@asp_text
+| 8=@asp_xml_directive;
+
+@asp_attribute = @asp_code | @asp_data_binding | @asp_quoted_string;
+
+asp_elements(
+  unique int id: @asp_element,
+  int kind: int ref,
+  int loc: @location ref);
+
+asp_comment_server(unique int comment: @asp_comment ref);
+asp_code_inline(unique int code: @asp_code ref);
+asp_directive_attribute(
+  int directive: @asp_directive ref,
+  int index: int ref,
+  string name: string ref,
+  int value: @asp_quoted_string ref);
+asp_directive_name(
+  unique int directive: @asp_directive ref,
+  string name: string ref);
+asp_element_body(
+  unique int element: @asp_element ref,
+  string body: string ref);
+asp_tag_attribute(
+  int tag: @asp_open_tag ref,
+  int index: int ref,
+  string name: string ref,
+  int attribute: @asp_attribute ref);
+asp_tag_name(
+  unique int tag: @asp_open_tag ref,
+  string name: string ref);
+asp_tag_isempty(int tag: @asp_open_tag ref);
+
+/* Common Intermediate Language - CIL */
+
+case @cil_instruction.opcode of
+  0 = @cil_nop
+| 1 = @cil_break
+| 2 = @cil_ldarg_0
+| 3 = @cil_ldarg_1
+| 4 = @cil_ldarg_2
+| 5 = @cil_ldarg_3
+| 6 = @cil_ldloc_0
+| 7 = @cil_ldloc_1
+| 8 = @cil_ldloc_2
+| 9 = @cil_ldloc_3
+| 10 = @cil_stloc_0
+| 11 = @cil_stloc_1
+| 12 = @cil_stloc_2
+| 13 = @cil_stloc_3
+| 14 = @cil_ldarg_s
+| 15 = @cil_ldarga_s
+| 16 = @cil_starg_s
+| 17 = @cil_ldloc_s
+| 18 = @cil_ldloca_s
+| 19 = @cil_stloc_s
+| 20 = @cil_ldnull
+| 21 = @cil_ldc_i4_m1
+| 22 = @cil_ldc_i4_0
+| 23 = @cil_ldc_i4_1
+| 24 = @cil_ldc_i4_2
+| 25 = @cil_ldc_i4_3
+| 26 = @cil_ldc_i4_4
+| 27 = @cil_ldc_i4_5
+| 28 = @cil_ldc_i4_6
+| 29 = @cil_ldc_i4_7
+| 30 = @cil_ldc_i4_8
+| 31 = @cil_ldc_i4_s
+| 32 = @cil_ldc_i4
+| 33 = @cil_ldc_i8
+| 34 = @cil_ldc_r4
+| 35 = @cil_ldc_r8
+| 37 = @cil_dup
+| 38 = @cil_pop
+| 39 = @cil_jmp
+| 40 = @cil_call
+| 41 = @cil_calli
+| 42 = @cil_ret
+| 43 = @cil_br_s
+| 44 = @cil_brfalse_s
+| 45 = @cil_brtrue_s
+| 46 = @cil_beq_s
+| 47 = @cil_bge_s
+| 48 = @cil_bgt_s
+| 49 = @cil_ble_s
+| 50 = @cil_blt_s
+| 51 = @cil_bne_un_s
+| 52 = @cil_bge_un_s
+| 53 = @cil_bgt_un_s
+| 54 = @cil_ble_un_s
+| 55 = @cil_blt_un_s
+| 56 = @cil_br
+| 57 = @cil_brfalse
+| 58 = @cil_brtrue
+| 59 = @cil_beq
+| 60 = @cil_bge
+| 61 = @cil_bgt
+| 62 = @cil_ble
+| 63 = @cil_blt
+| 64 = @cil_bne_un
+| 65 = @cil_bge_un
+| 66 = @cil_bgt_un
+| 67 = @cil_ble_un
+| 68 = @cil_blt_un
+| 69 = @cil_switch
+| 70 = @cil_ldind_i1
+| 71 = @cil_ldind_u1
+| 72 = @cil_ldind_i2
+| 73 = @cil_ldind_u2
+| 74 = @cil_ldind_i4
+| 75 = @cil_ldind_u4
+| 76 = @cil_ldind_i8
+| 77 = @cil_ldind_i
+| 78 = @cil_ldind_r4
+| 79 = @cil_ldind_r8
+| 80 = @cil_ldind_ref
+| 81 = @cil_stind_ref
+| 82 = @cil_stind_i1
+| 83 = @cil_stind_i2
+| 84 = @cil_stind_i4
+| 85 = @cil_stind_i8
+| 86 = @cil_stind_r4
+| 87 = @cil_stind_r8
+| 88 = @cil_add
+| 89 = @cil_sub
+| 90 = @cil_mul
+| 91 = @cil_div
+| 92 = @cil_div_un
+| 93 = @cil_rem
+| 94 = @cil_rem_un
+| 95 = @cil_and
+| 96 = @cil_or
+| 97 = @cil_xor
+| 98 = @cil_shl
+| 99 = @cil_shr
+| 100 = @cil_shr_un
+| 101 = @cil_neg
+| 102 = @cil_not
+| 103 = @cil_conv_i1
+| 104 = @cil_conv_i2
+| 105 = @cil_conv_i4
+| 106 = @cil_conv_i8
+| 107 = @cil_conv_r4
+| 108 = @cil_conv_r8
+| 109 = @cil_conv_u4
+| 110 = @cil_conv_u8
+| 111 = @cil_callvirt
+| 112 = @cil_cpobj
+| 113 = @cil_ldobj
+| 114 = @cil_ldstr
+| 115 = @cil_newobj
+| 116 = @cil_castclass
+| 117 = @cil_isinst
+| 118 = @cil_conv_r_un
+| 121 = @cil_unbox
+| 122 = @cil_throw
+| 123 = @cil_ldfld
+| 124 = @cil_ldflda
+| 125 = @cil_stfld
+| 126 = @cil_ldsfld
+| 127 = @cil_ldsflda
+| 128 = @cil_stsfld
+| 129 = @cil_stobj
+| 130 = @cil_conv_ovf_i1_un
+| 131 = @cil_conv_ovf_i2_un
+| 132 = @cil_conv_ovf_i4_un
+| 133 = @cil_conv_ovf_i8_un
+| 134 = @cil_conv_ovf_u1_un
+| 135 = @cil_conv_ovf_u2_un
+| 136 = @cil_conv_ovf_u4_un
+| 137 = @cil_conv_ovf_u8_un
+| 138 = @cil_conv_ovf_i_un
+| 139 = @cil_conv_ovf_u_un
+| 140 = @cil_box
+| 141 = @cil_newarr
+| 142 = @cil_ldlen
+| 143 = @cil_ldelema
+| 144 = @cil_ldelem_i1
+| 145 = @cil_ldelem_u1
+| 146 = @cil_ldelem_i2
+| 147 = @cil_ldelem_u2
+| 148 = @cil_ldelem_i4
+| 149 = @cil_ldelem_u4
+| 150 = @cil_ldelem_i8
+| 151 = @cil_ldelem_i
+| 152 = @cil_ldelem_r4
+| 153 = @cil_ldelem_r8
+| 154 = @cil_ldelem_ref
+| 155 = @cil_stelem_i
+| 156 = @cil_stelem_i1
+| 157 = @cil_stelem_i2
+| 158 = @cil_stelem_i4
+| 159 = @cil_stelem_i8
+| 160 = @cil_stelem_r4
+| 161 = @cil_stelem_r8
+| 162 = @cil_stelem_ref
+| 163 = @cil_ldelem
+| 164 = @cil_stelem
+| 165 = @cil_unbox_any
+| 179 = @cil_conv_ovf_i1
+| 180 = @cil_conv_ovf_u1
+| 181 = @cil_conv_ovf_i2
+| 182 = @cil_conv_ovf_u2
+| 183 = @cil_conv_ovf_i4
+| 184 = @cil_conv_ovf_u4
+| 185 = @cil_conv_ovf_i8
+| 186 = @cil_conv_ovf_u8
+| 194 = @cil_refanyval
+| 195 = @cil_ckinfinite
+| 198 = @cil_mkrefany
+| 208 = @cil_ldtoken
+| 209 = @cil_conv_u2
+| 210 = @cil_conv_u1
+| 211 = @cil_conv_i
+| 212 = @cil_conv_ovf_i
+| 213 = @cil_conv_ovf_u
+| 214 = @cil_add_ovf
+| 215 = @cil_add_ovf_un
+| 216 = @cil_mul_ovf
+| 217 = @cil_mul_ovf_un
+| 218 = @cil_sub_ovf
+| 219 = @cil_sub_ovf_un
+| 220 = @cil_endfinally
+| 221 = @cil_leave
+| 222 = @cil_leave_s
+| 223 = @cil_stind_i
+| 224 = @cil_conv_u
+| 65024 = @cil_arglist
+| 65025 = @cil_ceq
+| 65026 = @cil_cgt
+| 65027 = @cil_cgt_un
+| 65028 = @cil_clt
+| 65029 = @cil_clt_un
+| 65030 = @cil_ldftn
+| 65031 = @cil_ldvirtftn
+| 65033 = @cil_ldarg
+| 65034 = @cil_ldarga
+| 65035 = @cil_starg
+| 65036 = @cil_ldloc
+| 65037 = @cil_ldloca
+| 65038 = @cil_stloc
+| 65039 = @cil_localloc
+| 65041 = @cil_endfilter
+| 65042 = @cil_unaligned
+| 65043 = @cil_volatile
+| 65044 = @cil_tail
+| 65045 = @cil_initobj
+| 65046 = @cil_constrained
+| 65047 = @cil_cpblk
+| 65048 = @cil_initblk
+| 65050 = @cil_rethrow
+| 65052 = @cil_sizeof
+| 65053 = @cil_refanytype
+| 65054 = @cil_readonly
+;
+
+// CIL ignored instructions
+
+@cil_ignore = @cil_nop | @cil_break | @cil_volatile | @cil_unaligned;
+
+// CIL local/parameter/field access
+
+@cil_ldarg_any = @cil_ldarg_0 | @cil_ldarg_1 | @cil_ldarg_2 | @cil_ldarg_3 | @cil_ldarg_s | @cil_ldarga_s | @cil_ldarg | @cil_ldarga;
+@cil_starg_any = @cil_starg | @cil_starg_s;
+
+@cil_ldloc_any = @cil_ldloc_0 | @cil_ldloc_1 | @cil_ldloc_2 | @cil_ldloc_3 | @cil_ldloc_s | @cil_ldloca_s | @cil_ldloc | @cil_ldloca;
+@cil_stloc_any = @cil_stloc_0 | @cil_stloc_1 | @cil_stloc_2 | @cil_stloc_3 | @cil_stloc_s | @cil_stloc;
+
+@cil_ldfld_any = @cil_ldfld | @cil_ldsfld | @cil_ldsflda | @cil_ldflda;
+@cil_stfld_any = @cil_stfld | @cil_stsfld;
+
+@cil_local_access = @cil_stloc_any | @cil_ldloc_any;
+@cil_arg_access = @cil_starg_any | @cil_ldarg_any;
+@cil_read_access = @cil_ldloc_any | @cil_ldarg_any | @cil_ldfld_any;
+@cil_write_access = @cil_stloc_any | @cil_starg_any | @cil_stfld_any;
+
+@cil_stack_access = @cil_local_access | @cil_arg_access;
+@cil_field_access = @cil_ldfld_any | @cil_stfld_any;
+
+@cil_access = @cil_read_access | @cil_write_access;
+
+// CIL constant/literal instructions
+
+@cil_ldc_i = @cil_ldc_i4_any | @cil_ldc_i8;
+
+@cil_ldc_i4_any = @cil_ldc_i4_m1 | @cil_ldc_i4_0 | @cil_ldc_i4_1 | @cil_ldc_i4_2 | @cil_ldc_i4_3 |
+  @cil_ldc_i4_4 | @cil_ldc_i4_5 | @cil_ldc_i4_6 | @cil_ldc_i4_7 | @cil_ldc_i4_8 | @cil_ldc_i4_s | @cil_ldc_i4;
+
+@cil_ldc_r = @cil_ldc_r4 | @cil_ldc_r8;
+
+@cil_literal = @cil_ldnull | @cil_ldc_i | @cil_ldc_r | @cil_ldstr;
+
+// Control flow
+
+@cil_conditional_jump = @cil_binary_jump | @cil_unary_jump;
+@cil_binary_jump = @cil_beq_s | @cil_bge_s | @cil_bgt_s | @cil_ble_s | @cil_blt_s |
+    @cil_bne_un_s | @cil_bge_un_s | @cil_bgt_un_s | @cil_ble_un_s | @cil_blt_un_s |
+    @cil_beq | @cil_bge | @cil_bgt | @cil_ble | @cil_blt |
+    @cil_bne_un | @cil_bge_un | @cil_bgt_un | @cil_ble_un | @cil_blt_un;
+@cil_unary_jump = @cil_brfalse_s | @cil_brtrue_s | @cil_brfalse | @cil_brtrue | @cil_switch;
+@cil_unconditional_jump = @cil_br | @cil_br_s | @cil_leave_any;
+@cil_leave_any = @cil_leave | @cil_leave_s;
+@cil_jump = @cil_unconditional_jump | @cil_conditional_jump;
+
+// CIL call instructions
+
+@cil_call_any = @cil_jmp | @cil_call | @cil_calli | @cil_tail | @cil_callvirt | @cil_newobj;
+
+// CIL expression instructions
+
+@cil_expr = @cil_literal | @cil_binary_expr | @cil_unary_expr | @cil_call_any | @cil_read_access |
+  @cil_newarr | @cil_ldtoken | @cil_sizeof |
+  @cil_ldftn | @cil_ldvirtftn | @cil_localloc | @cil_mkrefany | @cil_refanytype | @cil_arglist | @cil_dup;
+
+@cil_unary_expr =
+  @cil_conversion_operation | @cil_unary_arithmetic_operation | @cil_unary_bitwise_operation|
+  @cil_ldlen | @cil_isinst | @cil_box | @cil_ldobj | @cil_castclass | @cil_unbox_any |
+  @cil_ldind | @cil_unbox;
+
+@cil_conversion_operation =
+  @cil_conv_i1 | @cil_conv_i2 | @cil_conv_i4 | @cil_conv_i8 |
+  @cil_conv_u1 | @cil_conv_u2 | @cil_conv_u4 | @cil_conv_u8 |
+  @cil_conv_ovf_i | @cil_conv_ovf_i_un | @cil_conv_ovf_i1 | @cil_conv_ovf_i1_un |
+  @cil_conv_ovf_i2 | @cil_conv_ovf_i2_un | @cil_conv_ovf_i4 | @cil_conv_ovf_i4_un |
+  @cil_conv_ovf_i8 | @cil_conv_ovf_i8_un | @cil_conv_ovf_u | @cil_conv_ovf_u_un |
+  @cil_conv_ovf_u1 | @cil_conv_ovf_u1_un | @cil_conv_ovf_u2 | @cil_conv_ovf_u2_un |
+  @cil_conv_ovf_u4 | @cil_conv_ovf_u4_un | @cil_conv_ovf_u8 | @cil_conv_ovf_u8_un |
+  @cil_conv_r4 | @cil_conv_r8 | @cil_conv_ovf_u2 | @cil_conv_ovf_u2_un |
+  @cil_conv_i | @cil_conv_u | @cil_conv_r_un;
+
+@cil_ldind = @cil_ldind_i | @cil_ldind_i1 | @cil_ldind_i2 | @cil_ldind_i4 | @cil_ldind_i8 |
+  @cil_ldind_r4 | @cil_ldind_r8 | @cil_ldind_ref | @cil_ldind_u1 | @cil_ldind_u2 | @cil_ldind_u4;
+
+@cil_stind = @cil_stind_i | @cil_stind_i1 | @cil_stind_i2 | @cil_stind_i4 | @cil_stind_i8 |
+  @cil_stind_r4 | @cil_stind_r8 | @cil_stind_ref;
+
+@cil_bitwise_operation = @cil_binary_bitwise_operation | @cil_unary_bitwise_operation;
+
+@cil_binary_bitwise_operation = @cil_and | @cil_or | @cil_xor | @cil_shr | @cil_shr | @cil_shr_un | @cil_shl;
+
+@cil_binary_arithmetic_operation = @cil_add | @cil_sub | @cil_mul | @cil_div | @cil_div_un |
+  @cil_rem | @cil_rem_un | @cil_add_ovf | @cil_add_ovf_un | @cil_mul_ovf | @cil_mul_ovf_un |
+  @cil_sub_ovf | @cil_sub_ovf_un;
+
+@cil_unary_bitwise_operation = @cil_not;
+
+@cil_binary_expr = @cil_binary_arithmetic_operation | @cil_binary_bitwise_operation | @cil_read_array | @cil_comparison_operation;
+
+@cil_unary_arithmetic_operation = @cil_neg;
+
+@cil_comparison_operation = @cil_cgt_un | @cil_ceq | @cil_cgt | @cil_clt | @cil_clt_un;
+
+// Elements that retrieve an address of something
+@cil_read_ref = @cil_ldloca_s | @cil_ldarga_s | @cil_ldflda | @cil_ldsflda | @cil_ldelema;
+
+// CIL array instructions
+
+@cil_read_array =
+  @cil_ldelem | @cil_ldelema | @cil_ldelem_i1 | @cil_ldelem_ref | @cil_ldelem_i |
+  @cil_ldelem_i1 | @cil_ldelem_i2 | @cil_ldelem_i4 | @cil_ldelem_i8 | @cil_ldelem_r4 |
+  @cil_ldelem_r8 | @cil_ldelem_u1 | @cil_ldelem_u2 | @cil_ldelem_u4;
+
+@cil_write_array = @cil_stelem | @cil_stelem_ref |
+  @cil_stelem_i | @cil_stelem_i1 | @cil_stelem_i2 | @cil_stelem_i4 | @cil_stelem_i8 |
+  @cil_stelem_r4 | @cil_stelem_r8;
+
+@cil_throw_any = @cil_throw | @cil_rethrow;
+
+#keyset[impl, index]
+cil_instruction(
+  unique int id: @cil_instruction,
+  int opcode: int ref,
+  int index: int ref,
+  int impl: @cil_method_implementation ref);
+
+cil_jump(
+  unique int instruction: @cil_jump ref,
+  int target: @cil_instruction ref);
+
+cil_access(
+  unique int instruction: @cil_instruction ref,
+  int target: @cil_accessible ref);
+
+cil_value(
+  unique int instruction: @cil_literal ref,
+  string value: string ref);
+
+#keyset[instruction, index]
+cil_switch(
+  int instruction: @cil_switch ref,
+  int index: int ref,
+  int target: @cil_instruction ref);
+
+cil_instruction_location(
+  unique int id: @cil_instruction ref,
+  int loc: @location ref);
+
+cil_type_location(
+  int id: @cil_type ref,
+  int loc: @location ref);
+
+cil_method_location(
+  int id: @cil_method ref,
+  int loc: @location ref);
+
+@cil_namespace = @namespace;
+
+@cil_type_container = @cil_type | @cil_namespace | @cil_method;
+
+case @cil_type.kind of
+  0 = @cil_valueorreftype
+| 1 = @cil_typeparameter
+| 2 = @cil_array_type
+| 3 = @cil_pointer_type
+| 4 = @cil_function_pointer_type
+;
+
+cil_type(
+  unique int id: @cil_type,
+  string name: string ref,
+  int kind: int ref,
+  int parent: @cil_type_container ref,
+  int sourceDecl: @cil_type ref);
+
+cil_pointer_type(
+  unique int id: @cil_pointer_type ref,
+  int pointee: @cil_type ref);
+
+cil_array_type(
+  unique int id: @cil_array_type ref,
+  int element_type: @cil_type ref,
+  int rank: int ref);
+
+cil_function_pointer_return_type(
+  unique int id: @cil_function_pointer_type ref,
+  int return_type: @cil_type ref);
+
+cil_method(
+  unique int id: @cil_method,
+  string name: string ref,
+  int parent: @cil_type ref,
+  int return_type: @cil_type ref);
+
+cil_method_source_declaration(
+  unique int method: @cil_method ref,
+  int source: @cil_method ref);
+
+cil_method_implementation(
+  unique int id: @cil_method_implementation,
+  int method: @cil_method ref,
+  int location: @assembly ref);
+
+cil_implements(
+  int id: @cil_method ref,
+  int decl: @cil_method ref);
+
+#keyset[parent, name]
+cil_field(
+  unique int id: @cil_field,
+  int parent: @cil_type ref,
+  string name: string ref,
+  int field_type: @cil_type ref);
+
+@cil_element = @cil_instruction | @cil_declaration | @cil_handler | @cil_attribute | @cil_namespace;
+@cil_named_element = @cil_declaration | @cil_namespace;
+@cil_declaration = @cil_variable | @cil_method | @cil_type | @cil_member;
+@cil_accessible = @cil_declaration;
+@cil_variable = @cil_field | @cil_stack_variable;
+@cil_stack_variable = @cil_local_variable | @cil_parameter;
+@cil_member = @cil_method | @cil_type | @cil_field | @cil_property | @cil_event;
+@cil_custom_modifier_receiver = @cil_method | @cil_property | @cil_parameter | @cil_field | @cil_function_pointer_type;
+@cil_parameterizable = @cil_method | @cil_function_pointer_type;
+@cil_has_type_annotation = @cil_stack_variable | @cil_property | @cil_method | @cil_function_pointer_type;
+
+#keyset[parameterizable, index]
+cil_parameter(
+  unique int id: @cil_parameter,
+  int parameterizable: @cil_parameterizable ref,
+  int index: int ref,
+  int param_type: @cil_type ref);
+
+cil_parameter_in(unique int id: @cil_parameter ref);
+cil_parameter_out(unique int id: @cil_parameter ref);
+
+cil_setter(unique int prop: @cil_property ref,
+  int method: @cil_method ref);
+
+#keyset[id, modifier]
+cil_custom_modifiers(
+  int id: @cil_custom_modifier_receiver ref,
+  int modifier: @cil_type ref,
+  int kind: int ref); // modreq: 1, modopt: 0
+
+cil_type_annotation(
+  int id: @cil_has_type_annotation ref,
+  int annotation: int ref);
+
+cil_getter(unique int prop: @cil_property ref,
+  int method: @cil_method ref);
+
+cil_adder(unique int event: @cil_event ref,
+  int method: @cil_method ref);
+
+cil_remover(unique int event: @cil_event ref, int method: @cil_method ref);
+
+cil_raiser(unique int event: @cil_event ref, int method: @cil_method ref);
+
+cil_property(
+  unique int id: @cil_property,
+  int parent: @cil_type ref,
+  string name: string ref,
+  int property_type: @cil_type ref);
+
+#keyset[parent, name]
+cil_event(unique int id: @cil_event,
+  int parent: @cil_type ref,
+  string name: string ref,
+  int event_type: @cil_type ref);
+
+#keyset[impl, index]
+cil_local_variable(
+  unique int id: @cil_local_variable,
+  int impl: @cil_method_implementation ref,
+  int index: int ref,
+  int var_type: @cil_type ref);
+
+cil_function_pointer_calling_conventions(
+  int id: @cil_function_pointer_type ref,
+  int kind: int ref);
+
+// CIL handlers (exception handlers etc).
+
+case @cil_handler.kind of
+  0 = @cil_catch_handler
+| 1 = @cil_filter_handler
+| 2 = @cil_finally_handler
+| 4 = @cil_fault_handler
+;
+
+#keyset[impl, index]
+cil_handler(
+  unique int id: @cil_handler,
+  int impl: @cil_method_implementation ref,
+  int index: int ref,
+  int kind: int ref,
+  int try_start: @cil_instruction ref,
+  int try_end: @cil_instruction ref,
+  int handler_start: @cil_instruction ref);
+
+cil_handler_filter(
+  unique int id: @cil_handler ref,
+  int filter_start: @cil_instruction ref);
+
+cil_handler_type(
+  unique int id: @cil_handler ref,
+  int catch_type: @cil_type ref);
+
+@cil_controlflow_node = @cil_entry_point | @cil_instruction;
+
+@cil_entry_point = @cil_method_implementation | @cil_handler;
+
+@cil_dataflow_node = @cil_instruction | @cil_variable | @cil_method;
+
+cil_method_stack_size(
+  unique int method: @cil_method_implementation ref,
+  int size: int ref);
+
+// CIL modifiers
+
+cil_public(int id: @cil_member ref);
+cil_private(int id: @cil_member ref);
+cil_protected(int id: @cil_member ref);
+cil_internal(int id: @cil_member ref);
+cil_static(int id: @cil_member ref);
+cil_sealed(int id: @cil_member ref);
+cil_virtual(int id: @cil_method ref);
+cil_abstract(int id: @cil_member ref);
+cil_class(int id: @cil_type ref);
+cil_interface(int id: @cil_type ref);
+cil_security(int id: @cil_member ref);
+cil_requiresecobject(int id: @cil_method ref);
+cil_specialname(int id: @cil_method ref);
+cil_newslot(int id: @cil_method ref);
+
+cil_base_class(unique int id: @cil_type ref, int base: @cil_type ref);
+cil_base_interface(int id: @cil_type ref, int base: @cil_type ref);
+cil_enum_underlying_type(unique int id: @cil_type ref, int underlying: @cil_type ref);
+
+#keyset[unbound, index]
+cil_type_parameter(
+  int unbound: @cil_member ref,
+  int index: int ref,
+  int param: @cil_typeparameter ref);
+
+#keyset[bound, index]
+cil_type_argument(
+  int bound: @cil_member ref,
+  int index: int ref,
+  int t: @cil_type ref);
+
+// CIL type parameter constraints
+
+cil_typeparam_covariant(int tp: @cil_typeparameter ref);
+cil_typeparam_contravariant(int tp: @cil_typeparameter ref);
+cil_typeparam_class(int tp: @cil_typeparameter ref);
+cil_typeparam_struct(int tp: @cil_typeparameter ref);
+cil_typeparam_new(int tp: @cil_typeparameter ref);
+cil_typeparam_constraint(int tp: @cil_typeparameter ref, int supertype: @cil_type ref);
+
+// CIL attributes
+
+cil_attribute(
+  unique int attributeid: @cil_attribute,
+  int element: @cil_declaration ref,
+  int constructor: @cil_method ref);
+
+#keyset[attribute_id, param]
+cil_attribute_named_argument(
+  int attribute_id: @cil_attribute ref,
+  string param: string ref,
+  string value: string ref);
+
+#keyset[attribute_id, index]
+cil_attribute_positional_argument(
+  int attribute_id: @cil_attribute ref,
+  int index: int ref,
+  string value: string ref);
+
+
+// Common .Net data model covering both C# and CIL
+
+// Common elements
+@dotnet_element = @element | @cil_element;
+@dotnet_named_element = @named_element | @cil_named_element;
+@dotnet_callable = @callable | @cil_method;
+@dotnet_variable = @variable | @cil_variable;
+@dotnet_field = @field | @cil_field;
+@dotnet_parameter = @parameter | @cil_parameter;
+@dotnet_declaration = @declaration | @cil_declaration;
+@dotnet_member = @member | @cil_member;
+@dotnet_event = @event | @cil_event;
+@dotnet_property = @property | @cil_property | @indexer;
+@dotnet_parameterizable = @parameterizable | @cil_parameterizable;
+
+// Common types
+@dotnet_type = @type | @cil_type;
+@dotnet_call = @call | @cil_call_any;
+@dotnet_throw = @throw_element | @cil_throw_any;
+@dotnet_valueorreftype = @cil_valueorreftype | @value_or_ref_type | @cil_array_type | @void_type;
+@dotnet_typeparameter = @type_parameter | @cil_typeparameter;
+@dotnet_array_type = @array_type | @cil_array_type;
+@dotnet_pointer_type = @pointer_type | @cil_pointer_type;
+@dotnet_type_parameter = @type_parameter | @cil_typeparameter;
+@dotnet_generic = @dotnet_valueorreftype | @dotnet_callable;
+
+// Attributes
+@dotnet_attribute = @attribute | @cil_attribute;
+
+// Expressions
+@dotnet_expr = @expr | @cil_expr;
+
+// Literals
+@dotnet_literal = @literal_expr | @cil_literal;
+@dotnet_string_literal = @string_literal_expr | @cil_ldstr;
+@dotnet_int_literal = @integer_literal_expr | @cil_ldc_i;
+@dotnet_float_literal = @float_literal_expr | @cil_ldc_r;
+@dotnet_null_literal = @null_literal_expr | @cil_ldnull;
+
+@metadata_entity = @cil_method | @cil_type | @cil_field | @cil_property | @field | @property |
+    @callable | @value_or_ref_type | @void_type;
+
+#keyset[entity, location]
+metadata_handle(int entity : @metadata_entity ref, int location: @assembly ref, int handle: int ref)
diff --git a/csharp/downgrades/d0fba103f7dee477dd7d9f6c038518b3f683b2c7/semmlecode.csharp.dbscheme b/csharp/downgrades/d0fba103f7dee477dd7d9f6c038518b3f683b2c7/semmlecode.csharp.dbscheme
new file mode 100644
index 00000000000..83aca6b3e4f
--- /dev/null
+++ b/csharp/downgrades/d0fba103f7dee477dd7d9f6c038518b3f683b2c7/semmlecode.csharp.dbscheme
@@ -0,0 +1,2067 @@
+/* This is a dummy line to alter the dbscheme, so we can make a database upgrade
+ * without actually changing any of the dbscheme predicates. It contains a date
+ * to allow for such updates in the future as well.
+ *
+ * 2021-07-14
+ *
+ * DO NOT remove this comment carelessly, since it can revert the dbscheme back to a
+ * previously seen state (matching a previously seen SHA), which would make the upgrade
+ * mechanism not work properly.
+ */
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    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
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | --compiler
+ * 1   | *path to compiler*
+ * 2   | f1.cs
+ * 3   | f2.cs
+ * 4   | f3.cs
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.cs
+ * 1   | f2.cs
+ * 2   | f3.cs
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The references used by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs /r:ref1.dll /r:ref2.dll /r:ref3.dll
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | ref1.dll
+ * 1   | ref2.dll
+ * 2   | ref3.dll
+ */
+#keyset[id, num]
+compilation_referencing_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(
+    unique int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location_default ref
+);
+
+extractor_messages(
+    unique int id: @extractor_message,
+    int severity: int ref,
+    string origin : string ref,
+    string text : string ref,
+    string entity : string ref,
+    int location: @location_default ref,
+    string stack_trace : string 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
+);
+
+compilation_assembly(
+  unique int id : @compilation ref,
+  int assembly: @assembly ref
+)
+
+// Populated by the CSV extractor
+externalData(
+   int id: @externalDataElement,
+   string path: string ref,
+   int column: int ref,
+   string value: string ref);
+
+sourceLocationPrefix(
+  string prefix: string ref);
+
+/*
+ * C# dbscheme
+ */
+
+/** ELEMENTS **/
+
+@element = @declaration | @stmt | @expr | @modifier | @attribute | @namespace_declaration
+         | @using_directive | @type_parameter_constraints | @externalDataElement
+         | @xmllocatable | @asp_element | @namespace | @preprocessor_directive;
+
+@declaration = @callable | @generic | @assignable | @namespace;
+
+@named_element = @namespace | @declaration;
+
+@declaration_with_accessors = @property | @indexer | @event;
+
+@assignable = @variable | @assignable_with_accessors | @event;
+
+@assignable_with_accessors = @property | @indexer;
+
+@attributable = @assembly | @field | @parameter | @operator | @method | @constructor
+              | @destructor | @callable_accessor | @value_or_ref_type | @declaration_with_accessors
+              | @local_function | @lambda_expr;
+
+/** LOCATIONS, ASEMMBLIES, MODULES, FILES and FOLDERS **/
+
+@location = @location_default | @assembly;
+
+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);
+
+locations_mapped(
+  unique int id: @location_default ref,
+  int mapped_to: @location_default ref);
+
+@sourceline = @file | @callable | @xmllocatable;
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref);
+
+assemblies(
+  unique int id: @assembly,
+  int file: @file ref,
+  string fullname: string ref,
+  string name: string ref,
+  string version: string ref);
+
+files(
+  unique int id: @file,
+  string name: string ref);
+
+folders(
+  unique int id: @folder,
+  string name: string ref);
+
+@container = @folder | @file ;
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref);
+
+file_extraction_mode(
+  unique int file: @file ref,
+  int mode: int ref
+  /* 0 = normal, 1 = standalone extractor */
+  );
+
+/** NAMESPACES **/
+
+@type_container = @namespace | @type;
+
+namespaces(
+  unique int id: @namespace,
+  string name: string ref);
+
+namespace_declarations(
+  unique int id: @namespace_declaration,
+  int namespace_id: @namespace ref);
+
+namespace_declaration_location(
+  unique int id: @namespace_declaration ref,
+  int loc: @location ref);
+
+parent_namespace(
+  unique int child_id: @type_container ref,
+  int namespace_id: @namespace ref);
+
+@declaration_or_directive = @namespace_declaration | @type | @using_directive;
+
+parent_namespace_declaration(
+  int child_id: @declaration_or_directive ref, // cannot be unique because of partial classes
+  int namespace_id: @namespace_declaration ref);
+
+@using_directive = @using_namespace_directive | @using_static_directive;
+
+using_global(
+  unique int id: @using_directive ref
+);
+
+using_namespace_directives(
+  unique int id: @using_namespace_directive,
+  int namespace_id: @namespace ref);
+
+using_static_directives(
+  unique int id: @using_static_directive,
+  int type_id: @type_or_ref ref);
+
+using_directive_location(
+  unique int id: @using_directive ref,
+  int loc: @location ref);
+
+@preprocessor_directive = @pragma_warning | @pragma_checksum | @directive_define | @directive_undefine | @directive_warning
+  | @directive_error | @directive_nullable | @directive_line | @directive_region | @directive_endregion | @directive_if
+  | @directive_elif | @directive_else | @directive_endif;
+
+@conditional_directive = @directive_if | @directive_elif;
+@branch_directive = @directive_if | @directive_elif | @directive_else;
+
+directive_ifs(
+  unique int id: @directive_if,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref); /* 0: false, 1: true */
+
+directive_elifs(
+  unique int id: @directive_elif,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref,  /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+directive_elses(
+  unique int id: @directive_else,
+  int branchTaken: int ref,   /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+#keyset[id, start]
+directive_endifs(
+  unique int id: @directive_endif,
+  unique int start: @directive_if ref);
+
+directive_define_symbols(
+  unique int id: @define_symbol_expr ref,
+  string name: string ref);
+
+directive_regions(
+  unique int id: @directive_region,
+  string name: string ref);
+
+#keyset[id, start]
+directive_endregions(
+  unique int id: @directive_endregion,
+  unique int start: @directive_region ref);
+
+directive_lines(
+  unique int id: @directive_line,
+  int kind: int ref); /* 0: default, 1: hidden, 2: numeric, 3: span */
+
+directive_line_value(
+  unique int id: @directive_line ref,
+  int line: int ref);
+
+directive_line_file(
+  unique int id: @directive_line ref,
+  int file: @file ref);
+
+directive_line_offset(
+  unique int id: @directive_line ref,
+  int offset: int ref);
+
+directive_line_span(
+  unique int id: @directive_line ref,
+  int startLine: int ref,
+  int startColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref);
+
+directive_nullables(
+  unique int id: @directive_nullable,
+  int setting: int ref, /* 0: disable, 1: enable, 2: restore */
+  int target: int ref); /* 0: none, 1: annotations, 2: warnings */
+
+directive_warnings(
+  unique int id: @directive_warning,
+  string message: string ref);
+
+directive_errors(
+  unique int id: @directive_error,
+  string message: string ref);
+
+directive_undefines(
+  unique int id: @directive_undefine,
+  string name: string ref);
+
+directive_defines(
+  unique int id: @directive_define,
+  string name: string ref);
+
+pragma_checksums(
+  unique int id: @pragma_checksum,
+  int file: @file ref,
+  string guid: string ref,
+  string bytes: string ref);
+
+pragma_warnings(
+  unique int id: @pragma_warning,
+  int kind: int ref /* 0 = disable, 1 = restore */);
+
+#keyset[id, index]
+pragma_warning_error_codes(
+  int id: @pragma_warning ref,
+  string errorCode: string ref,
+  int index: int ref);
+
+preprocessor_directive_location(
+  unique int id: @preprocessor_directive ref,
+  int loc: @location ref);
+
+preprocessor_directive_compilation(
+  unique int id: @preprocessor_directive ref,
+  int compilation: @compilation ref);
+
+preprocessor_directive_active(
+  unique int id: @preprocessor_directive ref,
+  int active: int ref);  /* 0: false, 1: true */
+
+/** TYPES **/
+
+types(
+  unique int id: @type,
+  int kind: int ref,
+  string name: string ref);
+
+case @type.kind of
+   1 = @bool_type
+|  2 = @char_type
+|  3 = @decimal_type
+|  4 = @sbyte_type
+|  5 = @short_type
+|  6 = @int_type
+|  7 = @long_type
+|  8 = @byte_type
+|  9 = @ushort_type
+| 10 = @uint_type
+| 11 = @ulong_type
+| 12 = @float_type
+| 13 = @double_type
+| 14 = @enum_type
+| 15 = @struct_type
+| 17 = @class_type
+| 19 = @interface_type
+| 20 = @delegate_type
+| 21 = @null_type
+| 22 = @type_parameter
+| 23 = @pointer_type
+| 24 = @nullable_type
+| 25 = @array_type
+| 26 = @void_type
+| 27 = @int_ptr_type
+| 28 = @uint_ptr_type
+| 29 = @dynamic_type
+| 30 = @arglist_type
+| 31 = @unknown_type
+| 32 = @tuple_type
+| 33 = @function_pointer_type
+  ;
+
+@simple_type = @bool_type | @char_type | @integral_type | @floating_point_type | @decimal_type;
+@integral_type = @signed_integral_type | @unsigned_integral_type;
+@signed_integral_type = @sbyte_type | @short_type | @int_type | @long_type;
+@unsigned_integral_type = @byte_type  | @ushort_type | @uint_type | @ulong_type;
+@floating_point_type = @float_type | @double_type;
+@value_type = @simple_type | @enum_type | @struct_type | @nullable_type | @int_ptr_type
+            | @uint_ptr_type | @tuple_type;
+@ref_type = @class_type | @interface_type | @array_type | @delegate_type | @null_type
+          | @dynamic_type;
+@value_or_ref_type = @value_type | @ref_type;
+
+typerefs(
+  unique int id: @typeref,
+  string name: string ref);
+
+typeref_type(
+  int id: @typeref ref,
+  unique int typeId: @type ref);
+
+@type_or_ref = @type | @typeref;
+
+array_element_type(
+  unique int array: @array_type ref,
+  int dimension: int ref,
+  int rank: int ref,
+  int element: @type_or_ref ref);
+
+nullable_underlying_type(
+  unique int nullable: @nullable_type ref,
+  int underlying: @type_or_ref ref);
+
+pointer_referent_type(
+  unique int pointer: @pointer_type ref,
+  int referent: @type_or_ref ref);
+
+enum_underlying_type(
+  unique int enum_id: @enum_type ref,
+  int underlying_type_id: @type_or_ref ref);
+
+delegate_return_type(
+  unique int delegate_id: @delegate_type ref,
+  int return_type_id: @type_or_ref ref);
+
+function_pointer_return_type(
+    unique int function_pointer_id: @function_pointer_type ref,
+    int return_type_id: @type_or_ref ref);
+
+extend(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+anonymous_types(
+  unique int id: @type ref);
+
+@interface_or_ref = @interface_type | @typeref;
+
+implement(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+type_location(
+  int id: @type ref,
+  int loc: @location ref);
+
+tuple_underlying_type(
+  unique int tuple: @tuple_type ref,
+  int struct: @type_or_ref ref);
+
+#keyset[tuple, index]
+tuple_element(
+  int tuple: @tuple_type ref,
+  int index: int ref,
+  unique int field: @field ref);
+
+attributes(
+  unique int id: @attribute,
+  int kind: int ref,
+  int type_id: @type_or_ref ref,
+  int target:  @attributable ref);
+
+case @attribute.kind of
+  0 = @attribute_default
+| 1 = @attribute_return
+| 2 = @attribute_assembly
+| 3 = @attribute_module
+;
+
+attribute_location(
+  int id: @attribute ref,
+  int loc: @location ref);
+
+@type_mention_parent = @element | @type_mention;
+
+type_mention(
+  unique int id: @type_mention,
+  int type_id: @type_or_ref ref,
+  int parent: @type_mention_parent ref);
+
+type_mention_location(
+  unique int id: @type_mention ref,
+  int loc: @location ref);
+
+@has_type_annotation = @assignable | @type_parameter | @callable | @expr | @delegate_type | @generic | @function_pointer_type;
+
+/**
+ * A direct annotation on an entity, for example `string? x;`.
+ *
+ * Annotations:
+ * 2 = reftype is not annotated "!"
+ * 3 = reftype is annotated "?"
+ * 4 = readonly ref type / in parameter
+ * 5 = ref type parameter, return or local variable
+ * 6 = out parameter
+ *
+ * Note that the annotation depends on the element it annotates.
+ * @assignable: The annotation is on the type of the assignable, for example the variable type.
+ * @type_parameter: The annotation is on the reftype constraint
+ * @callable: The annotation is on the return type
+ * @array_type: The annotation is on the element type
+ */
+type_annotation(int id: @has_type_annotation ref, int annotation: int ref);
+
+nullability(unique int nullability: @nullability, int kind: int ref);
+
+case @nullability.kind of
+  0 = @oblivious
+| 1 = @not_annotated
+| 2 = @annotated
+;
+
+#keyset[parent, index]
+nullability_parent(int nullability: @nullability ref, int index: int ref, int parent: @nullability ref)
+
+type_nullability(int id: @has_type_annotation ref, int nullability: @nullability ref);
+
+/**
+ * The nullable flow state of an expression, as determined by Roslyn.
+ *   0 = none (default, not populated)
+ *   1 = not null
+ *   2 = maybe null
+ */
+expr_flowstate(unique int id: @expr ref, int state: int ref);
+
+/** GENERICS **/
+
+@generic = @type | @method | @local_function;
+
+type_parameters(
+  unique int id: @type_parameter ref,
+  int index: int ref,
+  int generic_id: @generic ref,
+  int variance: int ref /* none = 0, out = 1, in = 2 */);
+
+#keyset[constructed_id, index]
+type_arguments(
+  int id: @type_or_ref ref,
+  int index: int ref,
+  int constructed_id: @generic_or_ref ref);
+
+@generic_or_ref = @generic | @typeref;
+
+constructed_generic(
+  unique int constructed: @generic ref,
+  int generic: @generic_or_ref ref);
+
+type_parameter_constraints(
+  unique int id: @type_parameter_constraints,
+  int param_id: @type_parameter ref);
+
+type_parameter_constraints_location(
+  int id: @type_parameter_constraints ref,
+  int loc: @location ref);
+
+general_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int kind: int ref /* class = 1, struct = 2, new = 3 */);
+
+specific_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref);
+
+specific_type_parameter_nullability(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref,
+  int nullability: @nullability ref);
+
+/** FUNCTION POINTERS */
+
+function_pointer_calling_conventions(
+  int id: @function_pointer_type ref,
+  int kind: int ref);
+
+#keyset[id, index]
+has_unmanaged_calling_conventions(
+  int id: @function_pointer_type ref,
+  int index: int ref,
+  int conv_id: @type_or_ref ref);
+
+/** MODIFIERS */
+
+@modifiable = @modifiable_direct | @event_accessor;
+
+@modifiable_direct = @member | @accessor | @local_function | @anonymous_function_expr;
+
+modifiers(
+  unique int id: @modifier,
+  string name: string ref);
+
+has_modifiers(
+  int id: @modifiable_direct ref,
+  int mod_id: @modifier ref);
+
+compiler_generated(unique int id: @modifiable ref);
+
+/** MEMBERS **/
+
+@member = @method | @constructor | @destructor | @field | @property | @event | @operator | @indexer | @type;
+
+@named_exprorstmt = @goto_stmt | @labeled_stmt | @expr;
+
+@virtualizable = @method | @property | @indexer | @event;
+
+exprorstmt_name(
+  unique int parent_id: @named_exprorstmt ref,
+  string name: string ref);
+
+nested_types(
+  unique int id: @type ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @type ref);
+
+properties(
+  unique int id: @property,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @property ref);
+
+property_location(
+  int id: @property ref,
+  int loc: @location ref);
+
+indexers(
+  unique int id: @indexer,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @indexer ref);
+
+indexer_location(
+  int id: @indexer ref,
+  int loc: @location ref);
+
+accessors(
+  unique int id: @accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_member_id: @member ref,
+  int unbound_id: @accessor ref);
+
+case @accessor.kind of
+  1 = @getter
+| 2 = @setter
+  ;
+
+init_only_accessors(
+  unique int id: @accessor ref);
+
+accessor_location(
+  int id: @accessor ref,
+  int loc: @location ref);
+
+events(
+  unique int id: @event,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @event ref);
+
+event_location(
+  int id: @event ref,
+  int loc: @location ref);
+
+event_accessors(
+  unique int id: @event_accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_event_id: @event ref,
+  int unbound_id: @event_accessor ref);
+
+case @event_accessor.kind of
+  1 = @add_event_accessor
+| 2 = @remove_event_accessor
+  ;
+
+event_accessor_location(
+  int id: @event_accessor ref,
+  int loc: @location ref);
+
+operators(
+  unique int id: @operator,
+  string name: string ref,
+  string symbol: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @operator ref);
+
+operator_location(
+  int id: @operator ref,
+  int loc: @location ref);
+
+constant_value(
+  int id: @variable ref,
+  string value: string ref);
+
+/** CALLABLES **/
+
+@callable = @method | @constructor | @destructor | @operator | @callable_accessor | @anonymous_function_expr | @local_function;
+
+@callable_accessor = @accessor | @event_accessor;
+
+methods(
+  unique int id: @method,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @method ref);
+
+method_location(
+  int id: @method ref,
+  int loc: @location ref);
+
+constructors(
+  unique int id: @constructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @constructor ref);
+
+constructor_location(
+  int id: @constructor ref,
+  int loc: @location ref);
+
+destructors(
+  unique int id: @destructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @destructor ref);
+
+destructor_location(
+  int id: @destructor ref,
+  int loc: @location ref);
+
+overrides(
+  int id: @callable ref,
+  int base_id: @callable ref);
+
+explicitly_implements(
+  int id: @member ref,
+  int interface_id: @interface_or_ref ref);
+
+local_functions(
+    unique int id: @local_function,
+    string name: string ref,
+    int return_type: @type ref,
+    int unbound_id: @local_function ref);
+
+local_function_stmts(
+    unique int fn: @local_function_stmt ref,
+    int stmt: @local_function ref);
+
+/** VARIABLES **/
+
+@variable = @local_scope_variable | @field;
+
+@local_scope_variable = @local_variable | @parameter;
+
+fields(
+  unique int id: @field,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @field ref);
+
+case @field.kind of
+  1 = @addressable_field
+| 2 = @constant
+  ;
+
+field_location(
+  int id: @field ref,
+  int loc: @location ref);
+
+localvars(
+  unique int id: @local_variable,
+  int kind: int ref,
+  string name: string ref,
+  int implicitly_typed: int ref /* 0 = no, 1 = yes */,
+  int type_id: @type_or_ref ref,
+  int parent_id: @local_var_decl_expr ref);
+
+case @local_variable.kind of
+  1 = @addressable_local_variable
+| 2 = @local_constant
+| 3 = @local_variable_ref
+  ;
+
+localvar_location(
+  unique int id: @local_variable ref,
+  int loc: @location ref);
+
+@parameterizable = @callable | @delegate_type | @indexer | @function_pointer_type;
+
+#keyset[name, parent_id]
+#keyset[index, parent_id]
+params(
+  unique int id: @parameter,
+  string name: string ref,
+  int type_id: @type_or_ref ref,
+  int index: int ref,
+  int mode: int ref, /* value = 0, ref = 1, out = 2, array = 3, this = 4 */
+  int parent_id: @parameterizable ref,
+  int unbound_id: @parameter ref);
+
+param_location(
+  int id: @parameter ref,
+  int loc: @location ref);
+
+/** STATEMENTS **/
+
+@exprorstmt_parent = @control_flow_element | @top_level_exprorstmt_parent;
+
+statements(
+  unique int id: @stmt,
+  int kind: int ref);
+
+#keyset[index, parent]
+stmt_parent(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_stmt_parent = @callable;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+stmt_parent_top_level(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @top_level_stmt_parent ref);
+
+case @stmt.kind of
+   1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @switch_stmt
+|  5 = @while_stmt
+|  6 = @do_stmt
+|  7 = @for_stmt
+|  8 = @foreach_stmt
+|  9 = @break_stmt
+| 10 = @continue_stmt
+| 11 = @goto_stmt
+| 12 = @goto_case_stmt
+| 13 = @goto_default_stmt
+| 14 = @throw_stmt
+| 15 = @return_stmt
+| 16 = @yield_stmt
+| 17 = @try_stmt
+| 18 = @checked_stmt
+| 19 = @unchecked_stmt
+| 20 = @lock_stmt
+| 21 = @using_block_stmt
+| 22 = @var_decl_stmt
+| 23 = @const_decl_stmt
+| 24 = @empty_stmt
+| 25 = @unsafe_stmt
+| 26 = @fixed_stmt
+| 27 = @label_stmt
+| 28 = @catch
+| 29 = @case_stmt
+| 30 = @local_function_stmt
+| 31 = @using_decl_stmt
+  ;
+
+@using_stmt = @using_block_stmt | @using_decl_stmt;
+
+@labeled_stmt = @label_stmt | @case;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @using_decl_stmt;
+
+@cond_stmt = @if_stmt | @switch_stmt;
+
+@loop_stmt = @while_stmt | @do_stmt | @for_stmt | @foreach_stmt;
+
+@jump_stmt = @break_stmt | @goto_any_stmt | @continue_stmt | @throw_stmt | @return_stmt
+           | @yield_stmt;
+
+@goto_any_stmt = @goto_default_stmt | @goto_case_stmt | @goto_stmt;
+
+
+stmt_location(
+  unique int id: @stmt ref,
+  int loc: @location ref);
+
+catch_type(
+  unique int catch_id: @catch ref,
+  int type_id: @type_or_ref ref,
+  int kind: int ref /* explicit = 1, implicit = 2 */);
+
+foreach_stmt_info(
+  unique int id: @foreach_stmt ref,
+  int kind: int ref /* non-async = 1, async = 2 */);
+
+@foreach_symbol =  @method | @property | @type_or_ref;
+
+#keyset[id, kind]
+foreach_stmt_desugar(
+  int id: @foreach_stmt ref,
+  int symbol: @foreach_symbol ref,
+  int kind: int ref /* GetEnumeratorMethod = 1, CurrentProperty = 2, MoveNextMethod = 3, DisposeMethod = 4, ElementType = 5 */);
+
+/** EXPRESSIONS **/
+
+expressions(
+  unique int id: @expr,
+  int kind: int ref,
+  int type_id: @type_or_ref ref);
+
+#keyset[index, parent]
+expr_parent(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_expr_parent = @attribute | @field | @property | @indexer | @parameter | @directive_if | @directive_elif;
+
+@top_level_exprorstmt_parent = @top_level_expr_parent | @top_level_stmt_parent;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+expr_parent_top_level(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @top_level_exprorstmt_parent ref);
+
+case @expr.kind of
+/* literal */
+   1 = @bool_literal_expr
+|  2 = @char_literal_expr
+|  3 = @decimal_literal_expr
+|  4 = @int_literal_expr
+|  5 = @long_literal_expr
+|  6 = @uint_literal_expr
+|  7 = @ulong_literal_expr
+|  8 = @float_literal_expr
+|  9 = @double_literal_expr
+| 10 = @string_literal_expr
+| 11 = @null_literal_expr
+/* primary & unary */
+| 12 = @this_access_expr
+| 13 = @base_access_expr
+| 14 = @local_variable_access_expr
+| 15 = @parameter_access_expr
+| 16 = @field_access_expr
+| 17 = @property_access_expr
+| 18 = @method_access_expr
+| 19 = @event_access_expr
+| 20 = @indexer_access_expr
+| 21 = @array_access_expr
+| 22 = @type_access_expr
+| 23 = @typeof_expr
+| 24 = @method_invocation_expr
+| 25 = @delegate_invocation_expr
+| 26 = @operator_invocation_expr
+| 27 = @cast_expr
+| 28 = @object_creation_expr
+| 29 = @explicit_delegate_creation_expr
+| 30 = @implicit_delegate_creation_expr
+| 31 = @array_creation_expr
+| 32 = @default_expr
+| 33 = @plus_expr
+| 34 = @minus_expr
+| 35 = @bit_not_expr
+| 36 = @log_not_expr
+| 37 = @post_incr_expr
+| 38 = @post_decr_expr
+| 39 = @pre_incr_expr
+| 40 = @pre_decr_expr
+/* multiplicative */
+| 41 = @mul_expr
+| 42 = @div_expr
+| 43 = @rem_expr
+/* additive */
+| 44 = @add_expr
+| 45 = @sub_expr
+/* shift */
+| 46 = @lshift_expr
+| 47 = @rshift_expr
+/* relational */
+| 48 = @lt_expr
+| 49 = @gt_expr
+| 50 = @le_expr
+| 51 = @ge_expr
+/* equality */
+| 52 = @eq_expr
+| 53 = @ne_expr
+/* logical */
+| 54 = @bit_and_expr
+| 55 = @bit_xor_expr
+| 56 = @bit_or_expr
+| 57 = @log_and_expr
+| 58 = @log_or_expr
+/* type testing */
+| 59 = @is_expr
+| 60 = @as_expr
+/* null coalescing */
+| 61 = @null_coalescing_expr
+/* conditional */
+| 62 = @conditional_expr
+/* assignment */
+| 63 = @simple_assign_expr
+| 64 = @assign_add_expr
+| 65 = @assign_sub_expr
+| 66 = @assign_mul_expr
+| 67 = @assign_div_expr
+| 68 = @assign_rem_expr
+| 69 = @assign_and_expr
+| 70 = @assign_xor_expr
+| 71 = @assign_or_expr
+| 72 = @assign_lshift_expr
+| 73 = @assign_rshift_expr
+/* more */
+| 74 = @object_init_expr
+| 75 = @collection_init_expr
+| 76 = @array_init_expr
+| 77 = @checked_expr
+| 78 = @unchecked_expr
+| 79 = @constructor_init_expr
+| 80 = @add_event_expr
+| 81 = @remove_event_expr
+| 82 = @par_expr
+| 83 = @local_var_decl_expr
+| 84 = @lambda_expr
+| 85 = @anonymous_method_expr
+| 86 = @namespace_expr
+/* dynamic */
+| 92 = @dynamic_element_access_expr
+| 93 = @dynamic_member_access_expr
+/* unsafe */
+| 100 = @pointer_indirection_expr
+| 101 = @address_of_expr
+| 102 = @sizeof_expr
+/* async */
+| 103 = @await_expr
+/* C# 6.0 */
+| 104 = @nameof_expr
+| 105 = @interpolated_string_expr
+| 106 = @unknown_expr
+/* C# 7.0 */
+| 107 = @throw_expr
+| 108 = @tuple_expr
+| 109 = @local_function_invocation_expr
+| 110 = @ref_expr
+| 111 = @discard_expr
+/* C# 8.0 */
+| 112 = @range_expr
+| 113 = @index_expr
+| 114 = @switch_expr
+| 115 = @recursive_pattern_expr
+| 116 = @property_pattern_expr
+| 117 = @positional_pattern_expr
+| 118 = @switch_case_expr
+| 119 = @assign_coalesce_expr
+| 120 = @suppress_nullable_warning_expr
+| 121 = @namespace_access_expr
+/* C# 9.0 */
+| 122 = @lt_pattern_expr
+| 123 = @gt_pattern_expr
+| 124 = @le_pattern_expr
+| 125 = @ge_pattern_expr
+| 126 = @not_pattern_expr
+| 127 = @and_pattern_expr
+| 128 = @or_pattern_expr
+| 129 = @function_pointer_invocation_expr
+| 130 = @with_expr
+/* C# 11.0 */
+| 131 = @list_pattern_expr
+| 132 = @slice_pattern_expr
+/* Preprocessor */
+| 999 = @define_symbol_expr
+;
+
+@switch = @switch_stmt | @switch_expr;
+@case = @case_stmt | @switch_case_expr;
+@pattern_match = @case | @is_expr;
+@unary_pattern_expr = @not_pattern_expr;
+@relational_pattern_expr = @gt_pattern_expr | @lt_pattern_expr | @ge_pattern_expr | @le_pattern_expr;
+@binary_pattern_expr = @and_pattern_expr | @or_pattern_expr;
+
+@integer_literal_expr = @int_literal_expr | @long_literal_expr | @uint_literal_expr | @ulong_literal_expr;
+@real_literal_expr = @float_literal_expr | @double_literal_expr | @decimal_literal_expr;
+@literal_expr = @bool_literal_expr | @char_literal_expr | @integer_literal_expr | @real_literal_expr
+              | @string_literal_expr | @null_literal_expr;
+
+@assign_expr = @simple_assign_expr | @assign_op_expr | @local_var_decl_expr;
+@assign_op_expr =  @assign_arith_expr | @assign_bitwise_expr | @assign_event_expr | @assign_coalesce_expr;
+@assign_event_expr = @add_event_expr | @remove_event_expr;
+
+@assign_arith_expr = @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr
+                   | @assign_rem_expr
+@assign_bitwise_expr = @assign_and_expr | @assign_or_expr | @assign_xor_expr
+                   | @assign_lshift_expr | @assign_rshift_expr;
+
+@member_access_expr = @field_access_expr | @property_access_expr | @indexer_access_expr | @event_access_expr
+                    | @method_access_expr | @type_access_expr | @dynamic_member_access_expr;
+@access_expr = @member_access_expr | @this_access_expr | @base_access_expr | @assignable_access_expr | @namespace_access_expr;
+@element_access_expr = @indexer_access_expr | @array_access_expr | @dynamic_element_access_expr;
+
+@local_variable_access = @local_variable_access_expr | @local_var_decl_expr;
+@local_scope_variable_access_expr = @parameter_access_expr | @local_variable_access;
+@variable_access_expr = @local_scope_variable_access_expr | @field_access_expr;
+
+@assignable_access_expr = @variable_access_expr | @property_access_expr | @element_access_expr
+                        | @event_access_expr | @dynamic_member_access_expr;
+
+@objectorcollection_init_expr = @object_init_expr | @collection_init_expr;
+
+@delegate_creation_expr = @explicit_delegate_creation_expr | @implicit_delegate_creation_expr;
+
+@bin_arith_op_expr = @mul_expr | @div_expr | @rem_expr | @add_expr | @sub_expr;
+@incr_op_expr =  @pre_incr_expr | @post_incr_expr;
+@decr_op_expr =  @pre_decr_expr | @post_decr_expr;
+@mut_op_expr = @incr_op_expr | @decr_op_expr;
+@un_arith_op_expr = @plus_expr | @minus_expr | @mut_op_expr;
+@arith_op_expr = @bin_arith_op_expr | @un_arith_op_expr;
+
+@ternary_log_op_expr = @conditional_expr;
+@bin_log_op_expr = @log_and_expr | @log_or_expr | @null_coalescing_expr;
+@un_log_op_expr = @log_not_expr;
+@log_expr = @un_log_op_expr | @bin_log_op_expr | @ternary_log_op_expr;
+
+@bin_bit_op_expr =  @bit_and_expr | @bit_or_expr | @bit_xor_expr | @lshift_expr
+                 | @rshift_expr;
+@un_bit_op_expr = @bit_not_expr;
+@bit_expr = @un_bit_op_expr | @bin_bit_op_expr;
+
+@equality_op_expr =  @eq_expr | @ne_expr;
+@rel_op_expr = @gt_expr | @lt_expr| @ge_expr | @le_expr;
+@comp_expr = @equality_op_expr | @rel_op_expr;
+
+@op_expr = @assign_expr | @un_op | @bin_op | @ternary_op;
+
+@ternary_op = @ternary_log_op_expr;
+@bin_op = @bin_arith_op_expr | @bin_log_op_expr | @bin_bit_op_expr | @comp_expr;
+@un_op = @un_arith_op_expr | @un_log_op_expr | @un_bit_op_expr | @sizeof_expr
+       | @pointer_indirection_expr | @address_of_expr;
+
+@anonymous_function_expr = @lambda_expr | @anonymous_method_expr;
+
+@call = @method_invocation_expr | @constructor_init_expr | @operator_invocation_expr
+      | @delegate_invocation_expr | @object_creation_expr | @call_access_expr
+      | @local_function_invocation_expr | @function_pointer_invocation_expr;
+
+@call_access_expr = @property_access_expr | @event_access_expr | @indexer_access_expr;
+
+@late_bindable_expr = @dynamic_element_access_expr | @dynamic_member_access_expr
+                    | @object_creation_expr | @method_invocation_expr | @operator_invocation_expr;
+
+@throw_element = @throw_expr | @throw_stmt;
+
+@implicitly_typeable_object_creation_expr = @object_creation_expr | @explicit_delegate_creation_expr;
+
+implicitly_typed_array_creation(
+  unique int id: @array_creation_expr ref);
+
+explicitly_sized_array_creation(
+  unique int id: @array_creation_expr ref);
+
+stackalloc_array_creation(
+  unique int id: @array_creation_expr ref);
+
+implicitly_typed_object_creation(
+  unique int id: @implicitly_typeable_object_creation_expr ref);
+
+mutator_invocation_mode(
+  unique int id: @operator_invocation_expr ref,
+  int mode: int ref /* prefix = 1, postfix = 2*/);
+
+expr_compiler_generated(
+  unique int id: @expr ref);
+
+expr_value(
+  unique int id: @expr ref,
+  string value: string ref);
+
+expr_call(
+  unique int caller_id: @expr ref,
+  int target_id: @callable ref);
+
+expr_access(
+  unique int accesser_id: @access_expr ref,
+  int target_id: @accessible ref);
+
+@accessible = @method | @assignable | @local_function | @namespace;
+
+expr_location(
+  unique int id: @expr ref,
+  int loc: @location ref);
+
+dynamic_member_name(
+  unique int id: @late_bindable_expr ref,
+  string name: string ref);
+
+@qualifiable_expr = @member_access_expr
+                  | @method_invocation_expr
+                  | @element_access_expr;
+
+conditional_access(
+  unique int id: @qualifiable_expr ref);
+
+expr_argument(
+  unique int id: @expr ref,
+  int mode: int ref);
+  /* mode is the same as params: value = 0, ref = 1, out = 2 */
+
+expr_argument_name(
+  unique int id: @expr ref,
+  string name: string ref);
+
+lambda_expr_return_type(
+  unique int id: @lambda_expr ref,
+  int type_id: @type_or_ref ref);
+  
+/** CONTROL/DATA FLOW **/
+
+@control_flow_element = @stmt | @expr;
+
+/* 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;
+
+/* Comments */
+
+commentline(
+  unique int id: @commentline,
+  int kind: int ref,
+  string text: string ref,
+  string rawtext: string ref);
+
+case @commentline.kind of
+  0 = @singlelinecomment
+| 1 = @xmldoccomment
+| 2 = @multilinecomment;
+
+commentline_location(
+  unique int id: @commentline ref,
+  int loc: @location ref);
+
+commentblock(
+  unique int id : @commentblock);
+
+commentblock_location(
+  unique int id: @commentblock ref,
+  int loc: @location ref);
+
+commentblock_binding(
+  int id: @commentblock ref,
+  int entity: @element ref,
+  int bindtype: int ref);    /* 0: Parent, 1: Best, 2: Before, 3: After */
+
+commentblock_child(
+  int id: @commentblock ref,
+  int commentline: @commentline ref,
+  int index: int ref);
+
+/* ASP.NET */
+
+case @asp_element.kind of
+  0=@asp_close_tag
+| 1=@asp_code
+| 2=@asp_comment
+| 3=@asp_data_binding
+| 4=@asp_directive
+| 5=@asp_open_tag
+| 6=@asp_quoted_string
+| 7=@asp_text
+| 8=@asp_xml_directive;
+
+@asp_attribute = @asp_code | @asp_data_binding | @asp_quoted_string;
+
+asp_elements(
+  unique int id: @asp_element,
+  int kind: int ref,
+  int loc: @location ref);
+
+asp_comment_server(unique int comment: @asp_comment ref);
+asp_code_inline(unique int code: @asp_code ref);
+asp_directive_attribute(
+  int directive: @asp_directive ref,
+  int index: int ref,
+  string name: string ref,
+  int value: @asp_quoted_string ref);
+asp_directive_name(
+  unique int directive: @asp_directive ref,
+  string name: string ref);
+asp_element_body(
+  unique int element: @asp_element ref,
+  string body: string ref);
+asp_tag_attribute(
+  int tag: @asp_open_tag ref,
+  int index: int ref,
+  string name: string ref,
+  int attribute: @asp_attribute ref);
+asp_tag_name(
+  unique int tag: @asp_open_tag ref,
+  string name: string ref);
+asp_tag_isempty(int tag: @asp_open_tag ref);
+
+/* Common Intermediate Language - CIL */
+
+case @cil_instruction.opcode of
+  0 = @cil_nop
+| 1 = @cil_break
+| 2 = @cil_ldarg_0
+| 3 = @cil_ldarg_1
+| 4 = @cil_ldarg_2
+| 5 = @cil_ldarg_3
+| 6 = @cil_ldloc_0
+| 7 = @cil_ldloc_1
+| 8 = @cil_ldloc_2
+| 9 = @cil_ldloc_3
+| 10 = @cil_stloc_0
+| 11 = @cil_stloc_1
+| 12 = @cil_stloc_2
+| 13 = @cil_stloc_3
+| 14 = @cil_ldarg_s
+| 15 = @cil_ldarga_s
+| 16 = @cil_starg_s
+| 17 = @cil_ldloc_s
+| 18 = @cil_ldloca_s
+| 19 = @cil_stloc_s
+| 20 = @cil_ldnull
+| 21 = @cil_ldc_i4_m1
+| 22 = @cil_ldc_i4_0
+| 23 = @cil_ldc_i4_1
+| 24 = @cil_ldc_i4_2
+| 25 = @cil_ldc_i4_3
+| 26 = @cil_ldc_i4_4
+| 27 = @cil_ldc_i4_5
+| 28 = @cil_ldc_i4_6
+| 29 = @cil_ldc_i4_7
+| 30 = @cil_ldc_i4_8
+| 31 = @cil_ldc_i4_s
+| 32 = @cil_ldc_i4
+| 33 = @cil_ldc_i8
+| 34 = @cil_ldc_r4
+| 35 = @cil_ldc_r8
+| 37 = @cil_dup
+| 38 = @cil_pop
+| 39 = @cil_jmp
+| 40 = @cil_call
+| 41 = @cil_calli
+| 42 = @cil_ret
+| 43 = @cil_br_s
+| 44 = @cil_brfalse_s
+| 45 = @cil_brtrue_s
+| 46 = @cil_beq_s
+| 47 = @cil_bge_s
+| 48 = @cil_bgt_s
+| 49 = @cil_ble_s
+| 50 = @cil_blt_s
+| 51 = @cil_bne_un_s
+| 52 = @cil_bge_un_s
+| 53 = @cil_bgt_un_s
+| 54 = @cil_ble_un_s
+| 55 = @cil_blt_un_s
+| 56 = @cil_br
+| 57 = @cil_brfalse
+| 58 = @cil_brtrue
+| 59 = @cil_beq
+| 60 = @cil_bge
+| 61 = @cil_bgt
+| 62 = @cil_ble
+| 63 = @cil_blt
+| 64 = @cil_bne_un
+| 65 = @cil_bge_un
+| 66 = @cil_bgt_un
+| 67 = @cil_ble_un
+| 68 = @cil_blt_un
+| 69 = @cil_switch
+| 70 = @cil_ldind_i1
+| 71 = @cil_ldind_u1
+| 72 = @cil_ldind_i2
+| 73 = @cil_ldind_u2
+| 74 = @cil_ldind_i4
+| 75 = @cil_ldind_u4
+| 76 = @cil_ldind_i8
+| 77 = @cil_ldind_i
+| 78 = @cil_ldind_r4
+| 79 = @cil_ldind_r8
+| 80 = @cil_ldind_ref
+| 81 = @cil_stind_ref
+| 82 = @cil_stind_i1
+| 83 = @cil_stind_i2
+| 84 = @cil_stind_i4
+| 85 = @cil_stind_i8
+| 86 = @cil_stind_r4
+| 87 = @cil_stind_r8
+| 88 = @cil_add
+| 89 = @cil_sub
+| 90 = @cil_mul
+| 91 = @cil_div
+| 92 = @cil_div_un
+| 93 = @cil_rem
+| 94 = @cil_rem_un
+| 95 = @cil_and
+| 96 = @cil_or
+| 97 = @cil_xor
+| 98 = @cil_shl
+| 99 = @cil_shr
+| 100 = @cil_shr_un
+| 101 = @cil_neg
+| 102 = @cil_not
+| 103 = @cil_conv_i1
+| 104 = @cil_conv_i2
+| 105 = @cil_conv_i4
+| 106 = @cil_conv_i8
+| 107 = @cil_conv_r4
+| 108 = @cil_conv_r8
+| 109 = @cil_conv_u4
+| 110 = @cil_conv_u8
+| 111 = @cil_callvirt
+| 112 = @cil_cpobj
+| 113 = @cil_ldobj
+| 114 = @cil_ldstr
+| 115 = @cil_newobj
+| 116 = @cil_castclass
+| 117 = @cil_isinst
+| 118 = @cil_conv_r_un
+| 121 = @cil_unbox
+| 122 = @cil_throw
+| 123 = @cil_ldfld
+| 124 = @cil_ldflda
+| 125 = @cil_stfld
+| 126 = @cil_ldsfld
+| 127 = @cil_ldsflda
+| 128 = @cil_stsfld
+| 129 = @cil_stobj
+| 130 = @cil_conv_ovf_i1_un
+| 131 = @cil_conv_ovf_i2_un
+| 132 = @cil_conv_ovf_i4_un
+| 133 = @cil_conv_ovf_i8_un
+| 134 = @cil_conv_ovf_u1_un
+| 135 = @cil_conv_ovf_u2_un
+| 136 = @cil_conv_ovf_u4_un
+| 137 = @cil_conv_ovf_u8_un
+| 138 = @cil_conv_ovf_i_un
+| 139 = @cil_conv_ovf_u_un
+| 140 = @cil_box
+| 141 = @cil_newarr
+| 142 = @cil_ldlen
+| 143 = @cil_ldelema
+| 144 = @cil_ldelem_i1
+| 145 = @cil_ldelem_u1
+| 146 = @cil_ldelem_i2
+| 147 = @cil_ldelem_u2
+| 148 = @cil_ldelem_i4
+| 149 = @cil_ldelem_u4
+| 150 = @cil_ldelem_i8
+| 151 = @cil_ldelem_i
+| 152 = @cil_ldelem_r4
+| 153 = @cil_ldelem_r8
+| 154 = @cil_ldelem_ref
+| 155 = @cil_stelem_i
+| 156 = @cil_stelem_i1
+| 157 = @cil_stelem_i2
+| 158 = @cil_stelem_i4
+| 159 = @cil_stelem_i8
+| 160 = @cil_stelem_r4
+| 161 = @cil_stelem_r8
+| 162 = @cil_stelem_ref
+| 163 = @cil_ldelem
+| 164 = @cil_stelem
+| 165 = @cil_unbox_any
+| 179 = @cil_conv_ovf_i1
+| 180 = @cil_conv_ovf_u1
+| 181 = @cil_conv_ovf_i2
+| 182 = @cil_conv_ovf_u2
+| 183 = @cil_conv_ovf_i4
+| 184 = @cil_conv_ovf_u4
+| 185 = @cil_conv_ovf_i8
+| 186 = @cil_conv_ovf_u8
+| 194 = @cil_refanyval
+| 195 = @cil_ckinfinite
+| 198 = @cil_mkrefany
+| 208 = @cil_ldtoken
+| 209 = @cil_conv_u2
+| 210 = @cil_conv_u1
+| 211 = @cil_conv_i
+| 212 = @cil_conv_ovf_i
+| 213 = @cil_conv_ovf_u
+| 214 = @cil_add_ovf
+| 215 = @cil_add_ovf_un
+| 216 = @cil_mul_ovf
+| 217 = @cil_mul_ovf_un
+| 218 = @cil_sub_ovf
+| 219 = @cil_sub_ovf_un
+| 220 = @cil_endfinally
+| 221 = @cil_leave
+| 222 = @cil_leave_s
+| 223 = @cil_stind_i
+| 224 = @cil_conv_u
+| 65024 = @cil_arglist
+| 65025 = @cil_ceq
+| 65026 = @cil_cgt
+| 65027 = @cil_cgt_un
+| 65028 = @cil_clt
+| 65029 = @cil_clt_un
+| 65030 = @cil_ldftn
+| 65031 = @cil_ldvirtftn
+| 65033 = @cil_ldarg
+| 65034 = @cil_ldarga
+| 65035 = @cil_starg
+| 65036 = @cil_ldloc
+| 65037 = @cil_ldloca
+| 65038 = @cil_stloc
+| 65039 = @cil_localloc
+| 65041 = @cil_endfilter
+| 65042 = @cil_unaligned
+| 65043 = @cil_volatile
+| 65044 = @cil_tail
+| 65045 = @cil_initobj
+| 65046 = @cil_constrained
+| 65047 = @cil_cpblk
+| 65048 = @cil_initblk
+| 65050 = @cil_rethrow
+| 65052 = @cil_sizeof
+| 65053 = @cil_refanytype
+| 65054 = @cil_readonly
+;
+
+// CIL ignored instructions
+
+@cil_ignore = @cil_nop | @cil_break | @cil_volatile | @cil_unaligned;
+
+// CIL local/parameter/field access
+
+@cil_ldarg_any = @cil_ldarg_0 | @cil_ldarg_1 | @cil_ldarg_2 | @cil_ldarg_3 | @cil_ldarg_s | @cil_ldarga_s | @cil_ldarg | @cil_ldarga;
+@cil_starg_any = @cil_starg | @cil_starg_s;
+
+@cil_ldloc_any = @cil_ldloc_0 | @cil_ldloc_1 | @cil_ldloc_2 | @cil_ldloc_3 | @cil_ldloc_s | @cil_ldloca_s | @cil_ldloc | @cil_ldloca;
+@cil_stloc_any = @cil_stloc_0 | @cil_stloc_1 | @cil_stloc_2 | @cil_stloc_3 | @cil_stloc_s | @cil_stloc;
+
+@cil_ldfld_any = @cil_ldfld | @cil_ldsfld | @cil_ldsflda | @cil_ldflda;
+@cil_stfld_any = @cil_stfld | @cil_stsfld;
+
+@cil_local_access = @cil_stloc_any | @cil_ldloc_any;
+@cil_arg_access = @cil_starg_any | @cil_ldarg_any;
+@cil_read_access = @cil_ldloc_any | @cil_ldarg_any | @cil_ldfld_any;
+@cil_write_access = @cil_stloc_any | @cil_starg_any | @cil_stfld_any;
+
+@cil_stack_access = @cil_local_access | @cil_arg_access;
+@cil_field_access = @cil_ldfld_any | @cil_stfld_any;
+
+@cil_access = @cil_read_access | @cil_write_access;
+
+// CIL constant/literal instructions
+
+@cil_ldc_i = @cil_ldc_i4_any | @cil_ldc_i8;
+
+@cil_ldc_i4_any = @cil_ldc_i4_m1 | @cil_ldc_i4_0 | @cil_ldc_i4_1 | @cil_ldc_i4_2 | @cil_ldc_i4_3 |
+  @cil_ldc_i4_4 | @cil_ldc_i4_5 | @cil_ldc_i4_6 | @cil_ldc_i4_7 | @cil_ldc_i4_8 | @cil_ldc_i4_s | @cil_ldc_i4;
+
+@cil_ldc_r = @cil_ldc_r4 | @cil_ldc_r8;
+
+@cil_literal = @cil_ldnull | @cil_ldc_i | @cil_ldc_r | @cil_ldstr;
+
+// Control flow
+
+@cil_conditional_jump = @cil_binary_jump | @cil_unary_jump;
+@cil_binary_jump = @cil_beq_s | @cil_bge_s | @cil_bgt_s | @cil_ble_s | @cil_blt_s |
+    @cil_bne_un_s | @cil_bge_un_s | @cil_bgt_un_s | @cil_ble_un_s | @cil_blt_un_s |
+    @cil_beq | @cil_bge | @cil_bgt | @cil_ble | @cil_blt |
+    @cil_bne_un | @cil_bge_un | @cil_bgt_un | @cil_ble_un | @cil_blt_un;
+@cil_unary_jump = @cil_brfalse_s | @cil_brtrue_s | @cil_brfalse | @cil_brtrue | @cil_switch;
+@cil_unconditional_jump = @cil_br | @cil_br_s | @cil_leave_any;
+@cil_leave_any = @cil_leave | @cil_leave_s;
+@cil_jump = @cil_unconditional_jump | @cil_conditional_jump;
+
+// CIL call instructions
+
+@cil_call_any = @cil_jmp | @cil_call | @cil_calli | @cil_tail | @cil_callvirt | @cil_newobj;
+
+// CIL expression instructions
+
+@cil_expr = @cil_literal | @cil_binary_expr | @cil_unary_expr | @cil_call_any | @cil_read_access |
+  @cil_newarr | @cil_ldtoken | @cil_sizeof |
+  @cil_ldftn | @cil_ldvirtftn | @cil_localloc | @cil_mkrefany | @cil_refanytype | @cil_arglist | @cil_dup;
+
+@cil_unary_expr =
+  @cil_conversion_operation | @cil_unary_arithmetic_operation | @cil_unary_bitwise_operation|
+  @cil_ldlen | @cil_isinst | @cil_box | @cil_ldobj | @cil_castclass | @cil_unbox_any |
+  @cil_ldind | @cil_unbox;
+
+@cil_conversion_operation =
+  @cil_conv_i1 | @cil_conv_i2 | @cil_conv_i4 | @cil_conv_i8 |
+  @cil_conv_u1 | @cil_conv_u2 | @cil_conv_u4 | @cil_conv_u8 |
+  @cil_conv_ovf_i | @cil_conv_ovf_i_un | @cil_conv_ovf_i1 | @cil_conv_ovf_i1_un |
+  @cil_conv_ovf_i2 | @cil_conv_ovf_i2_un | @cil_conv_ovf_i4 | @cil_conv_ovf_i4_un |
+  @cil_conv_ovf_i8 | @cil_conv_ovf_i8_un | @cil_conv_ovf_u | @cil_conv_ovf_u_un |
+  @cil_conv_ovf_u1 | @cil_conv_ovf_u1_un | @cil_conv_ovf_u2 | @cil_conv_ovf_u2_un |
+  @cil_conv_ovf_u4 | @cil_conv_ovf_u4_un | @cil_conv_ovf_u8 | @cil_conv_ovf_u8_un |
+  @cil_conv_r4 | @cil_conv_r8 | @cil_conv_ovf_u2 | @cil_conv_ovf_u2_un |
+  @cil_conv_i | @cil_conv_u | @cil_conv_r_un;
+
+@cil_ldind = @cil_ldind_i | @cil_ldind_i1 | @cil_ldind_i2 | @cil_ldind_i4 | @cil_ldind_i8 |
+  @cil_ldind_r4 | @cil_ldind_r8 | @cil_ldind_ref | @cil_ldind_u1 | @cil_ldind_u2 | @cil_ldind_u4;
+
+@cil_stind = @cil_stind_i | @cil_stind_i1 | @cil_stind_i2 | @cil_stind_i4 | @cil_stind_i8 |
+  @cil_stind_r4 | @cil_stind_r8 | @cil_stind_ref;
+
+@cil_bitwise_operation = @cil_binary_bitwise_operation | @cil_unary_bitwise_operation;
+
+@cil_binary_bitwise_operation = @cil_and | @cil_or | @cil_xor | @cil_shr | @cil_shr | @cil_shr_un | @cil_shl;
+
+@cil_binary_arithmetic_operation = @cil_add | @cil_sub | @cil_mul | @cil_div | @cil_div_un |
+  @cil_rem | @cil_rem_un | @cil_add_ovf | @cil_add_ovf_un | @cil_mul_ovf | @cil_mul_ovf_un |
+  @cil_sub_ovf | @cil_sub_ovf_un;
+
+@cil_unary_bitwise_operation = @cil_not;
+
+@cil_binary_expr = @cil_binary_arithmetic_operation | @cil_binary_bitwise_operation | @cil_read_array | @cil_comparison_operation;
+
+@cil_unary_arithmetic_operation = @cil_neg;
+
+@cil_comparison_operation = @cil_cgt_un | @cil_ceq | @cil_cgt | @cil_clt | @cil_clt_un;
+
+// Elements that retrieve an address of something
+@cil_read_ref = @cil_ldloca_s | @cil_ldarga_s | @cil_ldflda | @cil_ldsflda | @cil_ldelema;
+
+// CIL array instructions
+
+@cil_read_array =
+  @cil_ldelem | @cil_ldelema | @cil_ldelem_i1 | @cil_ldelem_ref | @cil_ldelem_i |
+  @cil_ldelem_i1 | @cil_ldelem_i2 | @cil_ldelem_i4 | @cil_ldelem_i8 | @cil_ldelem_r4 |
+  @cil_ldelem_r8 | @cil_ldelem_u1 | @cil_ldelem_u2 | @cil_ldelem_u4;
+
+@cil_write_array = @cil_stelem | @cil_stelem_ref |
+  @cil_stelem_i | @cil_stelem_i1 | @cil_stelem_i2 | @cil_stelem_i4 | @cil_stelem_i8 |
+  @cil_stelem_r4 | @cil_stelem_r8;
+
+@cil_throw_any = @cil_throw | @cil_rethrow;
+
+#keyset[impl, index]
+cil_instruction(
+  unique int id: @cil_instruction,
+  int opcode: int ref,
+  int index: int ref,
+  int impl: @cil_method_implementation ref);
+
+cil_jump(
+  unique int instruction: @cil_jump ref,
+  int target: @cil_instruction ref);
+
+cil_access(
+  unique int instruction: @cil_instruction ref,
+  int target: @cil_accessible ref);
+
+cil_value(
+  unique int instruction: @cil_literal ref,
+  string value: string ref);
+
+#keyset[instruction, index]
+cil_switch(
+  int instruction: @cil_switch ref,
+  int index: int ref,
+  int target: @cil_instruction ref);
+
+cil_instruction_location(
+  unique int id: @cil_instruction ref,
+  int loc: @location ref);
+
+cil_type_location(
+  int id: @cil_type ref,
+  int loc: @location ref);
+
+cil_method_location(
+  int id: @cil_method ref,
+  int loc: @location ref);
+
+@cil_namespace = @namespace;
+
+@cil_type_container = @cil_type | @cil_namespace | @cil_method;
+
+case @cil_type.kind of
+  0 = @cil_valueorreftype
+| 1 = @cil_typeparameter
+| 2 = @cil_array_type
+| 3 = @cil_pointer_type
+| 4 = @cil_function_pointer_type
+;
+
+cil_type(
+  unique int id: @cil_type,
+  string name: string ref,
+  int kind: int ref,
+  int parent: @cil_type_container ref,
+  int sourceDecl: @cil_type ref);
+
+cil_pointer_type(
+  unique int id: @cil_pointer_type ref,
+  int pointee: @cil_type ref);
+
+cil_array_type(
+  unique int id: @cil_array_type ref,
+  int element_type: @cil_type ref,
+  int rank: int ref);
+
+cil_function_pointer_return_type(
+  unique int id: @cil_function_pointer_type ref,
+  int return_type: @cil_type ref);
+
+cil_method(
+  unique int id: @cil_method,
+  string name: string ref,
+  int parent: @cil_type ref,
+  int return_type: @cil_type ref);
+
+cil_method_source_declaration(
+  unique int method: @cil_method ref,
+  int source: @cil_method ref);
+
+cil_method_implementation(
+  unique int id: @cil_method_implementation,
+  int method: @cil_method ref,
+  int location: @assembly ref);
+
+cil_implements(
+  int id: @cil_method ref,
+  int decl: @cil_method ref);
+
+#keyset[parent, name]
+cil_field(
+  unique int id: @cil_field,
+  int parent: @cil_type ref,
+  string name: string ref,
+  int field_type: @cil_type ref);
+
+@cil_element = @cil_instruction | @cil_declaration | @cil_handler | @cil_attribute | @cil_namespace;
+@cil_named_element = @cil_declaration | @cil_namespace;
+@cil_declaration = @cil_variable | @cil_method | @cil_type | @cil_member;
+@cil_accessible = @cil_declaration;
+@cil_variable = @cil_field | @cil_stack_variable;
+@cil_stack_variable = @cil_local_variable | @cil_parameter;
+@cil_member = @cil_method | @cil_type | @cil_field | @cil_property | @cil_event;
+@cil_custom_modifier_receiver = @cil_method | @cil_property | @cil_parameter | @cil_field | @cil_function_pointer_type;
+@cil_parameterizable = @cil_method | @cil_function_pointer_type;
+@cil_has_type_annotation = @cil_stack_variable | @cil_property | @cil_method | @cil_function_pointer_type;
+
+#keyset[parameterizable, index]
+cil_parameter(
+  unique int id: @cil_parameter,
+  int parameterizable: @cil_parameterizable ref,
+  int index: int ref,
+  int param_type: @cil_type ref);
+
+cil_parameter_in(unique int id: @cil_parameter ref);
+cil_parameter_out(unique int id: @cil_parameter ref);
+
+cil_setter(unique int prop: @cil_property ref,
+  int method: @cil_method ref);
+
+#keyset[id, modifier]
+cil_custom_modifiers(
+  int id: @cil_custom_modifier_receiver ref,
+  int modifier: @cil_type ref,
+  int kind: int ref); // modreq: 1, modopt: 0
+
+cil_type_annotation(
+  int id: @cil_has_type_annotation ref,
+  int annotation: int ref);
+
+cil_getter(unique int prop: @cil_property ref,
+  int method: @cil_method ref);
+
+cil_adder(unique int event: @cil_event ref,
+  int method: @cil_method ref);
+
+cil_remover(unique int event: @cil_event ref, int method: @cil_method ref);
+
+cil_raiser(unique int event: @cil_event ref, int method: @cil_method ref);
+
+cil_property(
+  unique int id: @cil_property,
+  int parent: @cil_type ref,
+  string name: string ref,
+  int property_type: @cil_type ref);
+
+#keyset[parent, name]
+cil_event(unique int id: @cil_event,
+  int parent: @cil_type ref,
+  string name: string ref,
+  int event_type: @cil_type ref);
+
+#keyset[impl, index]
+cil_local_variable(
+  unique int id: @cil_local_variable,
+  int impl: @cil_method_implementation ref,
+  int index: int ref,
+  int var_type: @cil_type ref);
+
+cil_function_pointer_calling_conventions(
+  int id: @cil_function_pointer_type ref,
+  int kind: int ref);
+
+// CIL handlers (exception handlers etc).
+
+case @cil_handler.kind of
+  0 = @cil_catch_handler
+| 1 = @cil_filter_handler
+| 2 = @cil_finally_handler
+| 4 = @cil_fault_handler
+;
+
+#keyset[impl, index]
+cil_handler(
+  unique int id: @cil_handler,
+  int impl: @cil_method_implementation ref,
+  int index: int ref,
+  int kind: int ref,
+  int try_start: @cil_instruction ref,
+  int try_end: @cil_instruction ref,
+  int handler_start: @cil_instruction ref);
+
+cil_handler_filter(
+  unique int id: @cil_handler ref,
+  int filter_start: @cil_instruction ref);
+
+cil_handler_type(
+  unique int id: @cil_handler ref,
+  int catch_type: @cil_type ref);
+
+@cil_controlflow_node = @cil_entry_point | @cil_instruction;
+
+@cil_entry_point = @cil_method_implementation | @cil_handler;
+
+@cil_dataflow_node = @cil_instruction | @cil_variable | @cil_method;
+
+cil_method_stack_size(
+  unique int method: @cil_method_implementation ref,
+  int size: int ref);
+
+// CIL modifiers
+
+cil_public(int id: @cil_member ref);
+cil_private(int id: @cil_member ref);
+cil_protected(int id: @cil_member ref);
+cil_internal(int id: @cil_member ref);
+cil_static(int id: @cil_member ref);
+cil_sealed(int id: @cil_member ref);
+cil_virtual(int id: @cil_method ref);
+cil_abstract(int id: @cil_member ref);
+cil_class(int id: @cil_type ref);
+cil_interface(int id: @cil_type ref);
+cil_security(int id: @cil_member ref);
+cil_requiresecobject(int id: @cil_method ref);
+cil_specialname(int id: @cil_method ref);
+cil_newslot(int id: @cil_method ref);
+
+cil_base_class(unique int id: @cil_type ref, int base: @cil_type ref);
+cil_base_interface(int id: @cil_type ref, int base: @cil_type ref);
+cil_enum_underlying_type(unique int id: @cil_type ref, int underlying: @cil_type ref);
+
+#keyset[unbound, index]
+cil_type_parameter(
+  int unbound: @cil_member ref,
+  int index: int ref,
+  int param: @cil_typeparameter ref);
+
+#keyset[bound, index]
+cil_type_argument(
+  int bound: @cil_member ref,
+  int index: int ref,
+  int t: @cil_type ref);
+
+// CIL type parameter constraints
+
+cil_typeparam_covariant(int tp: @cil_typeparameter ref);
+cil_typeparam_contravariant(int tp: @cil_typeparameter ref);
+cil_typeparam_class(int tp: @cil_typeparameter ref);
+cil_typeparam_struct(int tp: @cil_typeparameter ref);
+cil_typeparam_new(int tp: @cil_typeparameter ref);
+cil_typeparam_constraint(int tp: @cil_typeparameter ref, int supertype: @cil_type ref);
+
+// CIL attributes
+
+cil_attribute(
+  unique int attributeid: @cil_attribute,
+  int element: @cil_declaration ref,
+  int constructor: @cil_method ref);
+
+#keyset[attribute_id, param]
+cil_attribute_named_argument(
+  int attribute_id: @cil_attribute ref,
+  string param: string ref,
+  string value: string ref);
+
+#keyset[attribute_id, index]
+cil_attribute_positional_argument(
+  int attribute_id: @cil_attribute ref,
+  int index: int ref,
+  string value: string ref);
+
+
+// Common .Net data model covering both C# and CIL
+
+// Common elements
+@dotnet_element = @element | @cil_element;
+@dotnet_named_element = @named_element | @cil_named_element;
+@dotnet_callable = @callable | @cil_method;
+@dotnet_variable = @variable | @cil_variable;
+@dotnet_field = @field | @cil_field;
+@dotnet_parameter = @parameter | @cil_parameter;
+@dotnet_declaration = @declaration | @cil_declaration;
+@dotnet_member = @member | @cil_member;
+@dotnet_event = @event | @cil_event;
+@dotnet_property = @property | @cil_property | @indexer;
+@dotnet_parameterizable = @parameterizable | @cil_parameterizable;
+
+// Common types
+@dotnet_type = @type | @cil_type;
+@dotnet_call = @call | @cil_call_any;
+@dotnet_throw = @throw_element | @cil_throw_any;
+@dotnet_valueorreftype = @cil_valueorreftype | @value_or_ref_type | @cil_array_type | @void_type;
+@dotnet_typeparameter = @type_parameter | @cil_typeparameter;
+@dotnet_array_type = @array_type | @cil_array_type;
+@dotnet_pointer_type = @pointer_type | @cil_pointer_type;
+@dotnet_type_parameter = @type_parameter | @cil_typeparameter;
+@dotnet_generic = @dotnet_valueorreftype | @dotnet_callable;
+
+// Attributes
+@dotnet_attribute = @attribute | @cil_attribute;
+
+// Expressions
+@dotnet_expr = @expr | @cil_expr;
+
+// Literals
+@dotnet_literal = @literal_expr | @cil_literal;
+@dotnet_string_literal = @string_literal_expr | @cil_ldstr;
+@dotnet_int_literal = @integer_literal_expr | @cil_ldc_i;
+@dotnet_float_literal = @float_literal_expr | @cil_ldc_r;
+@dotnet_null_literal = @null_literal_expr | @cil_ldnull;
+
+@metadata_entity = @cil_method | @cil_type | @cil_field | @cil_property | @field | @property |
+    @callable | @value_or_ref_type | @void_type;
+
+#keyset[entity, location]
+metadata_handle(int entity : @metadata_entity ref, int location: @assembly ref, int handle: int ref)
diff --git a/csharp/downgrades/d0fba103f7dee477dd7d9f6c038518b3f683b2c7/upgrade.properties b/csharp/downgrades/d0fba103f7dee477dd7d9f6c038518b3f683b2c7/upgrade.properties
new file mode 100644
index 00000000000..d3e8b5e6318
--- /dev/null
+++ b/csharp/downgrades/d0fba103f7dee477dd7d9f6c038518b3f683b2c7/upgrade.properties
@@ -0,0 +1,3 @@
+description: Remove unsigned right shift and unsigned right shift assignment expression kinds.
+compatibility: backwards
+expressions.rel: run expressions.qlo
\ No newline at end of file
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expression.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expression.cs
index 6e0380da693..3984e7c00cf 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expression.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expression.cs
@@ -240,7 +240,7 @@ namespace Semmle.Extraction.CSharp.Entities
                 var callType = GetCallType(Context, node);
                 if (callType == CallType.Dynamic)
                 {
-                    UserOperator.OperatorSymbol(method.Name, out var operatorName);
+                    UserOperator.TryGetOperatorSymbol(method.Name, out var operatorName);
                     trapFile.dynamic_member_name(this, operatorName);
                     return;
                 }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Assignment.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Assignment.cs
index 553d6d8349a..cbd7afbc9fa 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Assignment.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Assignment.cs
@@ -71,6 +71,8 @@ namespace Semmle.Extraction.CSharp.Entities.Expressions
                     return ExprKind.ASSIGN_LSHIFT;
                 case SyntaxKind.GreaterThanGreaterThanEqualsToken:
                     return ExprKind.ASSIGN_RSHIFT;
+                case SyntaxKind.GreaterThanGreaterThanGreaterThanEqualsToken:
+                    return ExprKind.ASSIGN_URSHIFT;
                 case SyntaxKind.QuestionQuestionEqualsToken:
                     return ExprKind.ASSIGN_COALESCE;
                 default:
@@ -141,6 +143,8 @@ namespace Semmle.Extraction.CSharp.Entities.Expressions
                         return ExprKind.REM;
                     case ExprKind.ASSIGN_RSHIFT:
                         return ExprKind.RSHIFT;
+                    case ExprKind.ASSIGN_URSHIFT:
+                        return ExprKind.URSHIFT;
                     case ExprKind.ASSIGN_SUB:
                         return ExprKind.SUB;
                     case ExprKind.ASSIGN_XOR:
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Binary.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Binary.cs
index 5153c856a25..45d43ac94c0 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Binary.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Binary.cs
@@ -50,6 +50,7 @@ namespace Semmle.Extraction.CSharp.Entities.Expressions
                 case SyntaxKind.BarBarToken: return ExprKind.LOG_OR;
                 case SyntaxKind.GreaterThanEqualsToken: return ExprKind.GE;
                 case SyntaxKind.GreaterThanGreaterThanToken: return ExprKind.RSHIFT;
+                case SyntaxKind.GreaterThanGreaterThanGreaterThanToken: return ExprKind.URSHIFT;
                 case SyntaxKind.LessThanLessThanToken: return ExprKind.LSHIFT;
                 case SyntaxKind.CaretToken: return ExprKind.BIT_XOR;
                 case SyntaxKind.QuestionQuestionToken: return ExprKind.NULL_COALESCING;
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Factory.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Factory.cs
index a92715c4e1c..57e9dd47ef3 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Factory.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Factory.cs
@@ -38,6 +38,7 @@ namespace Semmle.Extraction.CSharp.Entities.Expressions
                     case SyntaxKind.IsExpression:
                     case SyntaxKind.AsExpression:
                     case SyntaxKind.RightShiftExpression:
+                    case SyntaxKind.UnsignedRightShiftExpression:
                     case SyntaxKind.LeftShiftExpression:
                     case SyntaxKind.ExclusiveOrExpression:
                     case SyntaxKind.CoalesceExpression:
@@ -76,6 +77,7 @@ namespace Semmle.Extraction.CSharp.Entities.Expressions
                     case SyntaxKind.ExclusiveOrAssignmentExpression:
                     case SyntaxKind.LeftShiftAssignmentExpression:
                     case SyntaxKind.RightShiftAssignmentExpression:
+                    case SyntaxKind.UnsignedRightShiftAssignmentExpression:
                     case SyntaxKind.DivideAssignmentExpression:
                     case SyntaxKind.ModuloAssignmentExpression:
                     case SyntaxKind.CoalesceAssignmentExpression:
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/UserOperator.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/UserOperator.cs
index 536af5065ed..f478d991919 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/UserOperator.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/UserOperator.cs
@@ -61,8 +61,7 @@ namespace Semmle.Extraction.CSharp.Entities
             containingType = Symbol.ContainingType;
             if (containingType is not null)
             {
-                var containingNamedType = containingType as INamedTypeSymbol;
-                return containingNamedType is null ||
+                return containingType is not INamedTypeSymbol containingNamedType ||
                     !containingNamedType.GetMembers(Symbol.Name).Contains(Symbol);
             }
 
@@ -83,7 +82,7 @@ namespace Semmle.Extraction.CSharp.Entities
         /// </summary>
         /// <param name="methodName">The method name.</param>
         /// <param name="operatorName">The converted operator name.</param>
-        public static bool OperatorSymbol(string methodName, out string operatorName)
+        public static bool TryGetOperatorSymbol(string methodName, out string operatorName)
         {
             var success = true;
             switch (methodName)
@@ -147,6 +146,9 @@ namespace Semmle.Extraction.CSharp.Entities
                 case "op_RightShift":
                     operatorName = ">>";
                     break;
+                case "op_UnsignedRightShift":
+                    operatorName = ">>>";
+                    break;
                 case "op_LeftShift":
                     operatorName = "<<";
                     break;
@@ -166,7 +168,7 @@ namespace Semmle.Extraction.CSharp.Entities
                     var match = Regex.Match(methodName, "^op_Checked(.*)$");
                     if (match.Success)
                     {
-                        OperatorSymbol("op_" + match.Groups[1], out var uncheckedName);
+                        TryGetOperatorSymbol("op_" + match.Groups[1], out var uncheckedName);
                         operatorName = "checked " + uncheckedName;
                         break;
                     }
@@ -190,7 +192,7 @@ namespace Semmle.Extraction.CSharp.Entities
                 return OperatorSymbol(cx, method.ExplicitInterfaceImplementations.First());
 
             var methodName = method.Name;
-            if (!OperatorSymbol(methodName, out var result))
+            if (!TryGetOperatorSymbol(methodName, out var result))
                 cx.ModelError(method, $"Unhandled operator name in OperatorSymbol(): '{methodName}'");
             return result;
         }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Kinds/ExprKind.cs b/csharp/extractor/Semmle.Extraction.CSharp/Kinds/ExprKind.cs
index a56ccf4c746..ef0b9412ef4 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Kinds/ExprKind.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Kinds/ExprKind.cs
@@ -127,6 +127,8 @@ namespace Semmle.Extraction.Kinds
         WITH = 130,
         LIST_PATTERN = 131,
         SLICE_PATTERN = 132,
+        URSHIFT = 133,
+        ASSIGN_URSHIFT = 134,
         DEFINE_SYMBOL = 999,
     }
 }
diff --git a/csharp/ql/lib/change-notes/2023-01-11-unsigned-right-shift.md b/csharp/ql/lib/change-notes/2023-01-11-unsigned-right-shift.md
new file mode 100644
index 00000000000..6c644b8b2fb
--- /dev/null
+++ b/csharp/ql/lib/change-notes/2023-01-11-unsigned-right-shift.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* C# 11: Added support for the unsigned right shift `>>>` and unsigned right shift assignment `>>>=` operators.
\ No newline at end of file
diff --git a/csharp/ql/lib/semmle/code/csharp/Callable.qll b/csharp/ql/lib/semmle/code/csharp/Callable.qll
index bc8e1294adb..ea88f814bce 100644
--- a/csharp/ql/lib/semmle/code/csharp/Callable.qll
+++ b/csharp/ql/lib/semmle/code/csharp/Callable.qll
@@ -636,8 +636,9 @@ class TrueOperator extends UnaryOperator {
  * (`SubOperator`), a multiplication operator (`MulOperator`), a division
  * operator (`DivOperator`), a remainder operator (`RemOperator`), an and
  * operator (`AndOperator`), an or operator (`OrOperator`), an xor
- * operator (`XorOperator`), a left shift operator (`LShiftOperator`),
- * a right shift operator (`RShiftOperator`), an equals operator (`EQOperator`),
+ * operator (`XorOperator`), a left shift operator (`LeftShiftOperator`),
+ * a right shift operator (`RightShiftOperator`), an unsigned right shift
+ * operator(`UnsignedRightShiftOperator`), an equals operator (`EQOperator`),
  * a not equals operator (`NEOperator`), a lesser than operator (`LTOperator`),
  * a greater than operator (`GTOperator`), a less than or equals operator
  * (`LEOperator`), or a greater than or equals operator (`GEOperator`).
@@ -791,14 +792,17 @@ class XorOperator extends BinaryOperator {
  * }
  * ```
  */
-class LShiftOperator extends BinaryOperator {
-  LShiftOperator() { this.getName() = "<<" }
+class LeftShiftOperator extends BinaryOperator {
+  LeftShiftOperator() { this.getName() = "<<" }
 
   override string getFunctionName() { result = "op_LeftShift" }
 
-  override string getAPrimaryQlClass() { result = "LShiftOperator" }
+  override string getAPrimaryQlClass() { result = "LeftShiftOperator" }
 }
 
+/** DEPRECATED: Alias for LeftShiftOperator. */
+deprecated class LShiftOperator = LeftShiftOperator;
+
 /**
  * A user-defined right shift operator (`>>`), for example
  *
@@ -808,12 +812,32 @@ class LShiftOperator extends BinaryOperator {
  * }
  * ```
  */
-class RShiftOperator extends BinaryOperator {
-  RShiftOperator() { this.getName() = ">>" }
+class RightShiftOperator extends BinaryOperator {
+  RightShiftOperator() { this.getName() = ">>" }
 
   override string getFunctionName() { result = "op_RightShift" }
 
-  override string getAPrimaryQlClass() { result = "RShiftOperator" }
+  override string getAPrimaryQlClass() { result = "RightShiftOperator" }
+}
+
+/** DEPRECATED: Alias for RightShiftOperator. */
+deprecated class RShiftOperator = RightShiftOperator;
+
+/**
+ * A user-defined unsigned right shift operator (`>>>`), for example
+ *
+ * ```csharp
+ * public static Widget operator >>>(Widget lhs, Widget rhs) {
+ *   ...
+ * }
+ * ```
+ */
+class UnsignedRightShiftOperator extends BinaryOperator {
+  UnsignedRightShiftOperator() { this.getName() = ">>>" }
+
+  override string getFunctionName() { result = "op_UnsignedRightShift" }
+
+  override string getAPrimaryQlClass() { result = "UnsignedRightShiftOperator" }
 }
 
 /**
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/ModulusAnalysis.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/ModulusAnalysis.qll
index b919d143a39..5b2a39ad6c9 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/ModulusAnalysis.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/ModulusAnalysis.qll
@@ -105,7 +105,7 @@ private predicate evenlyDivisibleExpr(Expr e, int factor) {
   exists(ConstantIntegerExpr c, int k | k = c.getIntValue() |
     e.(MulExpr).getAnOperand() = c and factor = k.abs() and factor >= 2
     or
-    e.(LShiftExpr).getRhs() = c and factor = 2.pow(k) and k > 0
+    e.(LeftShiftExpr).getRhs() = c and factor = 2.pow(k) and k > 0
     or
     e.(BitwiseAndExpr).getAnOperand() = c and factor = max(int f | andmaskFactor(k, f))
   )
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/ModulusAnalysisSpecific.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/ModulusAnalysisSpecific.qll
index 74aee61e690..4a9c3cdbe6d 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/ModulusAnalysisSpecific.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/ModulusAnalysisSpecific.qll
@@ -30,7 +30,7 @@ module Private {
 
   class MulExpr = RU::ExprNode::MulExpr;
 
-  class LShiftExpr = RU::ExprNode::LShiftExpr;
+  class LeftShiftExpr = RU::ExprNode::LeftShiftExpr;
 
   predicate guardDirectlyControlsSsaRead = RU::guardControlsSsaRead/3;
 
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/RangeUtils.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/RangeUtils.qll
index ce7637ccd92..fe4505b6e2e 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/RangeUtils.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/RangeUtils.qll
@@ -391,17 +391,24 @@ module ExprNode {
   }
 
   /** A left-shift operation. */
-  class LShiftExpr extends BinaryOperation {
-    override CS::LShiftExpr e;
+  class LeftShiftExpr extends BinaryOperation {
+    override CS::LeftShiftExpr e;
 
-    override TLShiftOp getOp() { any() }
+    override TLeftShiftOp getOp() { any() }
   }
 
   /** A right-shift operation. */
-  class RShiftExpr extends BinaryOperation {
-    override CS::RShiftExpr e;
+  class RightShiftExpr extends BinaryOperation {
+    override CS::RightShiftExpr e;
 
-    override TRShiftOp getOp() { any() }
+    override TRightShiftOp getOp() { any() }
+  }
+
+  /** An unsigned right-shift operation. */
+  class UnsignedRightShiftExpr extends BinaryOperation {
+    override CS::UnsignedRightShiftExpr e;
+
+    override TUnsignedRightShiftOp getOp() { any() }
   }
 
   /** A conditional expression. */
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/Sign.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/Sign.qll
index b2058a27114..649b4216996 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/Sign.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/Sign.qll
@@ -18,9 +18,9 @@ newtype TBinarySignOperation =
   TBitAndOp() or
   TBitOrOp() or
   TBitXorOp() or
-  TLShiftOp() or
-  TRShiftOp() or
-  TURShiftOp()
+  TLeftShiftOp() or
+  TRightShiftOp() or
+  TUnsignedRightShiftOp()
 
 /** Class representing expression signs (+, -, 0). */
 class Sign extends TSign {
@@ -271,10 +271,10 @@ class Sign extends TSign {
     or
     op = TBitXorOp() and result = bitxor(s)
     or
-    op = TLShiftOp() and result = lshift(s)
+    op = TLeftShiftOp() and result = lshift(s)
     or
-    op = TRShiftOp() and result = rshift(s)
+    op = TRightShiftOp() and result = rshift(s)
     or
-    op = TURShiftOp() and result = urshift(s)
+    op = TUnsignedRightShiftOp() and result = urshift(s)
   }
 }
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/SignAnalysisSpecific.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/SignAnalysisSpecific.qll
index 9102bf29131..5b61ca54682 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/SignAnalysisSpecific.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/SignAnalysisSpecific.qll
@@ -211,8 +211,9 @@ private module Impl {
     not e.getExpr() instanceof BitwiseAndExpr and
     not e.getExpr() instanceof BitwiseOrExpr and
     not e.getExpr() instanceof BitwiseXorExpr and
-    not e.getExpr() instanceof LShiftExpr and
-    not e.getExpr() instanceof RShiftExpr and
+    not e.getExpr() instanceof LeftShiftExpr and
+    not e.getExpr() instanceof RightShiftExpr and
+    not e.getExpr() instanceof UnsignedRightShiftExpr and
     not e.getExpr() instanceof ConditionalExpr and
     not e.getExpr() instanceof RefExpr and
     not e.getExpr() instanceof LocalVariableDeclAndInitExpr and
diff --git a/csharp/ql/lib/semmle/code/csharp/exprs/Assignment.qll b/csharp/ql/lib/semmle/code/csharp/exprs/Assignment.qll
index 562a4dd9cd5..14da6da266f 100644
--- a/csharp/ql/lib/semmle/code/csharp/exprs/Assignment.qll
+++ b/csharp/ql/lib/semmle/code/csharp/exprs/Assignment.qll
@@ -150,8 +150,9 @@ class AssignRemExpr extends AssignArithmeticOperation, @assign_rem_expr {
  * operation (`AssignAndExpr`), a bitwise-or assignment
  * operation (`AssignOrExpr`), a bitwise exclusive-or assignment
  * operation (`AssignXorExpr`), a left-shift assignment
- * operation (`AssignLShiftExpr`), or a right-shift assignment
- * operation (`AssignRShiftExpr`).
+ * operation (`AssignLeftShiftExpr`), or a right-shift assignment
+ * operation (`AssignRightShiftExpr`), or an unsigned right-shift assignment
+ * operation (`AssignUnsignedRightShiftExpr`).
  */
 class AssignBitwiseOperation extends AssignOperation, @assign_bitwise_expr { }
 
@@ -185,19 +186,34 @@ class AssignXorExpr extends AssignBitwiseOperation, @assign_xor_expr {
 /**
  * A left-shift assignment operation, for example `x <<= y`.
  */
-class AssignLShiftExpr extends AssignBitwiseOperation, @assign_lshift_expr {
+class AssignLeftShiftExpr extends AssignBitwiseOperation, @assign_lshift_expr {
   override string getOperator() { result = "<<=" }
 
-  override string getAPrimaryQlClass() { result = "AssignLShiftExpr" }
+  override string getAPrimaryQlClass() { result = "AssignLeftShiftExpr" }
 }
 
+/** DEPRECATED: Alias for AssignLeftShipExpr. */
+deprecated class AssignLShiftExpr = AssignLeftShiftExpr;
+
 /**
  * A right-shift assignment operation, for example `x >>= y`.
  */
-class AssignRShiftExpr extends AssignBitwiseOperation, @assign_rshift_expr {
+class AssignRightShiftExpr extends AssignBitwiseOperation, @assign_rshift_expr {
   override string getOperator() { result = ">>=" }
 
-  override string getAPrimaryQlClass() { result = "AssignRShiftExpr" }
+  override string getAPrimaryQlClass() { result = "AssignRightShiftExpr" }
+}
+
+/** DEPRECATED: Alias for AssignRightShiftExpr. */
+deprecated class AssignRShiftExpr = AssignRightShiftExpr;
+
+/**
+ * An unsigned right-shift assignment operation, for example `x >>>= y`.
+ */
+class AssignUnsighedRightShiftExpr extends AssignBitwiseOperation, @assign_urshift_expr {
+  override string getOperator() { result = ">>>=" }
+
+  override string getAPrimaryQlClass() { result = "AssignUnsighedRightShiftExpr" }
 }
 
 /**
diff --git a/csharp/ql/lib/semmle/code/csharp/exprs/BitwiseOperation.qll b/csharp/ql/lib/semmle/code/csharp/exprs/BitwiseOperation.qll
index a23da710465..d32485a51f8 100644
--- a/csharp/ql/lib/semmle/code/csharp/exprs/BitwiseOperation.qll
+++ b/csharp/ql/lib/semmle/code/csharp/exprs/BitwiseOperation.qll
@@ -31,7 +31,8 @@ class ComplementExpr extends UnaryBitwiseOperation, @bit_not_expr {
  * A binary bitwise operation. Either a bitwise-and operation
  * (`BitwiseAndExpr`), a bitwise-or operation (`BitwiseOrExpr`),
  * a bitwise exclusive-or operation (`BitwiseXorExpr`), a left-shift
- * operation (`LShiftExpr`), or a right-shift operation (`RShiftExpr`).
+ * operation (`LeftShiftExpr`), a right-shift operation (`RightShiftExpr`),
+ * or an unsigned right-shift operation (`UnsignedRightShiftExpr`).
  */
 class BinaryBitwiseOperation extends BitwiseOperation, BinaryOperation, @bin_bit_op_expr {
   override string getOperator() { none() }
@@ -40,19 +41,34 @@ class BinaryBitwiseOperation extends BitwiseOperation, BinaryOperation, @bin_bit
 /**
  * A left-shift operation, for example `x << y`.
  */
-class LShiftExpr extends BinaryBitwiseOperation, @lshift_expr {
+class LeftShiftExpr extends BinaryBitwiseOperation, @lshift_expr {
   override string getOperator() { result = "<<" }
 
-  override string getAPrimaryQlClass() { result = "LShiftExpr" }
+  override string getAPrimaryQlClass() { result = "LeftShiftExpr" }
 }
 
+/** DEPRECATED: Alias for LeftShiftExpr. */
+deprecated class LShiftExpr = LeftShiftExpr;
+
 /**
  * A right-shift operation, for example `x >> y`.
  */
-class RShiftExpr extends BinaryBitwiseOperation, @rshift_expr {
+class RightShiftExpr extends BinaryBitwiseOperation, @rshift_expr {
   override string getOperator() { result = ">>" }
 
-  override string getAPrimaryQlClass() { result = "RShiftExpr" }
+  override string getAPrimaryQlClass() { result = "RightShiftExpr" }
+}
+
+/** DEPRECATED: Alias for RightShiftExpr. */
+deprecated class RShiftExpr = RightShiftExpr;
+
+/**
+ * An unsigned right-shift operation, for example `x >>> y`.
+ */
+class UnsignedRightShiftExpr extends BinaryBitwiseOperation, @urshift_expr {
+  override string getOperator() { result = ">>>" }
+
+  override string getAPrimaryQlClass() { result = "UnsignedRightShiftExpr" }
 }
 
 /**
diff --git a/csharp/ql/lib/semmlecode.csharp.dbscheme b/csharp/ql/lib/semmlecode.csharp.dbscheme
index 83aca6b3e4f..d0fba103f7d 100644
--- a/csharp/ql/lib/semmlecode.csharp.dbscheme
+++ b/csharp/ql/lib/semmlecode.csharp.dbscheme
@@ -1137,6 +1137,8 @@ case @expr.kind of
 /* C# 11.0 */
 | 131 = @list_pattern_expr
 | 132 = @slice_pattern_expr
+| 133 = @urshift_expr
+| 134 = @assign_urshift_expr
 /* Preprocessor */
 | 999 = @define_symbol_expr
 ;
@@ -1160,7 +1162,7 @@ case @expr.kind of
 @assign_arith_expr = @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr
                    | @assign_rem_expr
 @assign_bitwise_expr = @assign_and_expr | @assign_or_expr | @assign_xor_expr
-                   | @assign_lshift_expr | @assign_rshift_expr;
+                   | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr;
 
 @member_access_expr = @field_access_expr | @property_access_expr | @indexer_access_expr | @event_access_expr
                     | @method_access_expr | @type_access_expr | @dynamic_member_access_expr;
@@ -1191,7 +1193,7 @@ case @expr.kind of
 @log_expr = @un_log_op_expr | @bin_log_op_expr | @ternary_log_op_expr;
 
 @bin_bit_op_expr =  @bit_and_expr | @bit_or_expr | @bit_xor_expr | @lshift_expr
-                 | @rshift_expr;
+                 | @rshift_expr | @urshift_expr;
 @un_bit_op_expr = @bit_not_expr;
 @bit_expr = @un_bit_op_expr | @bin_bit_op_expr;
 
diff --git a/csharp/ql/lib/semmlecode.csharp.dbscheme.stats b/csharp/ql/lib/semmlecode.csharp.dbscheme.stats
index 04516487ee9..b7c93de7353 100644
--- a/csharp/ql/lib/semmlecode.csharp.dbscheme.stats
+++ b/csharp/ql/lib/semmlecode.csharp.dbscheme.stats
@@ -17,12 +17,12 @@
             <v>0</v>
         </e>
         <e>
-            <k>@assembly</k>
-            <v>14676</v>
+            <k>@file</k>
+            <v>106540</v>
         </e>
         <e>
-            <k>@file</k>
-            <v>106541</v>
+            <k>@assembly</k>
+            <v>14676</v>
         </e>
         <e>
             <k>@folder</k>
@@ -30,35 +30,31 @@
         </e>
         <e>
             <k>@namespace</k>
-            <v>500337</v>
+            <v>500332</v>
         </e>
         <e>
             <k>@namespace_declaration</k>
-            <v>42810</v>
+            <v>42809</v>
         </e>
         <e>
             <k>@using_namespace_directive</k>
-            <v>223779</v>
+            <v>223777</v>
         </e>
         <e>
             <k>@using_static_directive</k>
             <v>3484</v>
         </e>
-        <e>
-            <k>@directive_if</k>
-            <v>16750</v>
-        </e>
         <e>
             <k>@directive_elif</k>
             <v>275</v>
         </e>
         <e>
-            <k>@directive_else</k>
-            <v>5439</v>
+            <k>@directive_if</k>
+            <v>16749</v>
         </e>
         <e>
-            <k>@location_default</k>
-            <v>137912010</v>
+            <k>@directive_else</k>
+            <v>5439</v>
         </e>
         <e>
             <k>@directive_endif</k>
@@ -92,6 +88,10 @@
             <k>@directive_undefine</k>
             <v>55</v>
         </e>
+        <e>
+            <k>@location_default</k>
+            <v>137911541</v>
+        </e>
         <e>
             <k>@directive_define</k>
             <v>66</v>
@@ -106,7 +106,7 @@
         </e>
         <e>
             <k>@typeref</k>
-            <v>4815264</v>
+            <v>4815219</v>
         </e>
         <e>
             <k>@bool_type</k>
@@ -162,23 +162,23 @@
         </e>
         <e>
             <k>@enum_type</k>
-            <v>204056</v>
+            <v>204054</v>
         </e>
         <e>
             <k>@struct_type</k>
-            <v>1036578</v>
+            <v>1036568</v>
         </e>
         <e>
             <k>@class_type</k>
-            <v>5157996</v>
+            <v>5157948</v>
         </e>
         <e>
             <k>@interface_type</k>
-            <v>3246154</v>
+            <v>3246124</v>
         </e>
         <e>
             <k>@delegate_type</k>
-            <v>1214025</v>
+            <v>1214014</v>
         </e>
         <e>
             <k>@null_type</k>
@@ -186,7 +186,7 @@
         </e>
         <e>
             <k>@type_parameter</k>
-            <v>991372</v>
+            <v>991363</v>
         </e>
         <e>
             <k>@pointer_type</k>
@@ -198,7 +198,7 @@
         </e>
         <e>
             <k>@array_type</k>
-            <v>116793</v>
+            <v>116792</v>
         </e>
         <e>
             <k>@void_type</k>
@@ -222,7 +222,7 @@
         </e>
         <e>
             <k>@tuple_type</k>
-            <v>37858</v>
+            <v>37857</v>
         </e>
         <e>
             <k>@function_pointer_type</k>
@@ -232,26 +232,26 @@
             <k>@uint_ptr_type</k>
             <v>0</v>
         </e>
-        <e>
-            <k>@type_mention</k>
-            <v>2667838</v>
-        </e>
         <e>
             <k>@attribute_default</k>
-            <v>14361364</v>
+            <v>14361230</v>
         </e>
         <e>
             <k>@attribute_return</k>
-            <v>224363</v>
+            <v>224361</v>
         </e>
         <e>
             <k>@attribute_assembly</k>
-            <v>52426</v>
+            <v>52425</v>
         </e>
         <e>
             <k>@attribute_module</k>
             <v>53</v>
         </e>
+        <e>
+            <k>@type_mention</k>
+            <v>2667808</v>
+        </e>
         <e>
             <k>@oblivious</k>
             <v>21291</v>
@@ -266,7 +266,7 @@
         </e>
         <e>
             <k>@type_parameter_constraints</k>
-            <v>991372</v>
+            <v>991363</v>
         </e>
         <e>
             <k>@modifier</k>
@@ -274,19 +274,19 @@
         </e>
         <e>
             <k>@property</k>
-            <v>6642412</v>
+            <v>6642350</v>
         </e>
         <e>
             <k>@indexer</k>
-            <v>105719</v>
+            <v>105718</v>
         </e>
         <e>
             <k>@getter</k>
-            <v>6738210</v>
+            <v>6738147</v>
         </e>
         <e>
             <k>@setter</k>
-            <v>1177149</v>
+            <v>1177138</v>
         </e>
         <e>
             <k>@event</k>
@@ -302,15 +302,15 @@
         </e>
         <e>
             <k>@operator</k>
-            <v>629721</v>
+            <v>629715</v>
         </e>
         <e>
             <k>@method</k>
-            <v>20454980</v>
+            <v>20454789</v>
         </e>
         <e>
             <k>@constructor</k>
-            <v>5991233</v>
+            <v>5991176</v>
         </e>
         <e>
             <k>@destructor</k>
@@ -322,15 +322,15 @@
         </e>
         <e>
             <k>@addressable_field</k>
-            <v>11102837</v>
+            <v>11102733</v>
         </e>
         <e>
             <k>@constant</k>
-            <v>3873680</v>
+            <v>3873643</v>
         </e>
         <e>
             <k>@addressable_local_variable</k>
-            <v>497829</v>
+            <v>497825</v>
         </e>
         <e>
             <k>@local_constant</k>
@@ -342,19 +342,19 @@
         </e>
         <e>
             <k>@parameter</k>
-            <v>37386455</v>
+            <v>37386105</v>
         </e>
         <e>
             <k>@block_stmt</k>
-            <v>643009</v>
+            <v>643003</v>
         </e>
         <e>
             <k>@expr_stmt</k>
-            <v>698450</v>
+            <v>698444</v>
         </e>
         <e>
             <k>@if_stmt</k>
-            <v>299700</v>
+            <v>299697</v>
         </e>
         <e>
             <k>@switch_stmt</k>
@@ -366,7 +366,7 @@
         </e>
         <e>
             <k>@do_stmt</k>
-            <v>1916</v>
+            <v>1915</v>
         </e>
         <e>
             <k>@for_stmt</k>
@@ -374,15 +374,15 @@
         </e>
         <e>
             <k>@foreach_stmt</k>
-            <v>26826</v>
+            <v>26825</v>
         </e>
         <e>
             <k>@break_stmt</k>
-            <v>106776</v>
+            <v>106775</v>
         </e>
         <e>
             <k>@continue_stmt</k>
-            <v>8596</v>
+            <v>8595</v>
         </e>
         <e>
             <k>@goto_stmt</k>
@@ -394,11 +394,11 @@
         </e>
         <e>
             <k>@throw_stmt</k>
-            <v>157116</v>
+            <v>157106</v>
         </e>
         <e>
             <k>@return_stmt</k>
-            <v>301790</v>
+            <v>301787</v>
         </e>
         <e>
             <k>@yield_stmt</k>
@@ -426,7 +426,7 @@
         </e>
         <e>
             <k>@var_decl_stmt</k>
-            <v>449250</v>
+            <v>449246</v>
         </e>
         <e>
             <k>@const_decl_stmt</k>
@@ -446,7 +446,7 @@
         </e>
         <e>
             <k>@case_stmt</k>
-            <v>118515</v>
+            <v>118513</v>
         </e>
         <e>
             <k>@goto_default_stmt</k>
@@ -466,19 +466,19 @@
         </e>
         <e>
             <k>@using_decl_stmt</k>
-            <v>11564</v>
+            <v>11563</v>
         </e>
         <e>
             <k>@bool_literal_expr</k>
-            <v>472283</v>
+            <v>472278</v>
         </e>
         <e>
             <k>@char_literal_expr</k>
-            <v>61271</v>
+            <v>61270</v>
         </e>
         <e>
             <k>@int_literal_expr</k>
-            <v>3354291</v>
+            <v>3354259</v>
         </e>
         <e>
             <k>@long_literal_expr</k>
@@ -490,27 +490,27 @@
         </e>
         <e>
             <k>@ulong_literal_expr</k>
-            <v>3300</v>
+            <v>3299</v>
         </e>
         <e>
             <k>@float_literal_expr</k>
-            <v>109488</v>
+            <v>109487</v>
         </e>
         <e>
             <k>@double_literal_expr</k>
-            <v>54800</v>
+            <v>54799</v>
         </e>
         <e>
             <k>@string_literal_expr</k>
-            <v>2171269</v>
+            <v>2171248</v>
         </e>
         <e>
             <k>@null_literal_expr</k>
-            <v>215382</v>
+            <v>215366</v>
         </e>
         <e>
             <k>@this_access_expr</k>
-            <v>857625</v>
+            <v>857617</v>
         </e>
         <e>
             <k>@base_access_expr</k>
@@ -518,19 +518,19 @@
         </e>
         <e>
             <k>@local_variable_access_expr</k>
-            <v>1451844</v>
+            <v>1451830</v>
         </e>
         <e>
             <k>@parameter_access_expr</k>
-            <v>841262</v>
+            <v>841254</v>
         </e>
         <e>
             <k>@field_access_expr</k>
-            <v>1097227</v>
+            <v>1097217</v>
         </e>
         <e>
             <k>@property_access_expr</k>
-            <v>1242991</v>
+            <v>1242979</v>
         </e>
         <e>
             <k>@method_access_expr</k>
@@ -550,15 +550,15 @@
         </e>
         <e>
             <k>@type_access_expr</k>
-            <v>1243003</v>
+            <v>1242991</v>
         </e>
         <e>
             <k>@typeof_expr</k>
-            <v>597670</v>
+            <v>597664</v>
         </e>
         <e>
             <k>@method_invocation_expr</k>
-            <v>1078551</v>
+            <v>1078542</v>
         </e>
         <e>
             <k>@delegate_invocation_expr</k>
@@ -566,15 +566,15 @@
         </e>
         <e>
             <k>@operator_invocation_expr</k>
-            <v>596656</v>
+            <v>596650</v>
         </e>
         <e>
             <k>@cast_expr</k>
-            <v>781499</v>
+            <v>781491</v>
         </e>
         <e>
             <k>@object_creation_expr</k>
-            <v>202927</v>
+            <v>202926</v>
         </e>
         <e>
             <k>@explicit_delegate_creation_expr</k>
@@ -586,11 +586,11 @@
         </e>
         <e>
             <k>@array_creation_expr</k>
-            <v>565044</v>
+            <v>565039</v>
         </e>
         <e>
             <k>@default_expr</k>
-            <v>669657</v>
+            <v>669651</v>
         </e>
         <e>
             <k>@minus_expr</k>
@@ -598,7 +598,7 @@
         </e>
         <e>
             <k>@log_not_expr</k>
-            <v>60763</v>
+            <v>60762</v>
         </e>
         <e>
             <k>@post_incr_expr</k>
@@ -618,7 +618,7 @@
         </e>
         <e>
             <k>@mul_expr</k>
-            <v>9154</v>
+            <v>9153</v>
         </e>
         <e>
             <k>@div_expr</k>
@@ -630,11 +630,11 @@
         </e>
         <e>
             <k>@add_expr</k>
-            <v>72534</v>
+            <v>72533</v>
         </e>
         <e>
             <k>@sub_expr</k>
-            <v>25994</v>
+            <v>25993</v>
         </e>
         <e>
             <k>@lshift_expr</k>
@@ -646,11 +646,11 @@
         </e>
         <e>
             <k>@lt_expr</k>
-            <v>34251</v>
+            <v>34250</v>
         </e>
         <e>
             <k>@gt_expr</k>
-            <v>20968</v>
+            <v>20967</v>
         </e>
         <e>
             <k>@le_expr</k>
@@ -658,15 +658,15 @@
         </e>
         <e>
             <k>@ge_expr</k>
-            <v>12159</v>
+            <v>12158</v>
         </e>
         <e>
             <k>@eq_expr</k>
-            <v>135300</v>
+            <v>135298</v>
         </e>
         <e>
             <k>@ne_expr</k>
-            <v>117244</v>
+            <v>117243</v>
         </e>
         <e>
             <k>@bit_and_expr</k>
@@ -682,7 +682,7 @@
         </e>
         <e>
             <k>@log_and_expr</k>
-            <v>51646</v>
+            <v>51645</v>
         </e>
         <e>
             <k>@log_or_expr</k>
@@ -690,7 +690,7 @@
         </e>
         <e>
             <k>@is_expr</k>
-            <v>19997</v>
+            <v>19994</v>
         </e>
         <e>
             <k>@as_expr</k>
@@ -702,11 +702,11 @@
         </e>
         <e>
             <k>@conditional_expr</k>
-            <v>34750</v>
+            <v>34749</v>
         </e>
         <e>
             <k>@simple_assign_expr</k>
-            <v>1223633</v>
+            <v>1223622</v>
         </e>
         <e>
             <k>@assign_add_expr</k>
@@ -726,7 +726,7 @@
         </e>
         <e>
             <k>@object_init_expr</k>
-            <v>163090</v>
+            <v>163088</v>
         </e>
         <e>
             <k>@collection_init_expr</k>
@@ -734,7 +734,7 @@
         </e>
         <e>
             <k>@array_init_expr</k>
-            <v>564188</v>
+            <v>564183</v>
         </e>
         <e>
             <k>@checked_expr</k>
@@ -746,7 +746,7 @@
         </e>
         <e>
             <k>@constructor_init_expr</k>
-            <v>42947</v>
+            <v>42945</v>
         </e>
         <e>
             <k>@add_event_expr</k>
@@ -758,11 +758,11 @@
         </e>
         <e>
             <k>@local_var_decl_expr</k>
-            <v>499277</v>
+            <v>499273</v>
         </e>
         <e>
             <k>@lambda_expr</k>
-            <v>200792</v>
+            <v>200791</v>
         </e>
         <e>
             <k>@anonymous_method_expr</k>
@@ -778,7 +778,7 @@
         </e>
         <e>
             <k>@nameof_expr</k>
-            <v>50715</v>
+            <v>50714</v>
         </e>
         <e>
             <k>@interpolated_string_expr</k>
@@ -794,15 +794,15 @@
         </e>
         <e>
             <k>@discard_expr</k>
-            <v>30087</v>
+            <v>30086</v>
         </e>
         <e>
             <k>@define_symbol_expr</k>
-            <v>32513</v>
+            <v>32512</v>
         </e>
         <e>
             <k>@decimal_literal_expr</k>
-            <v>157044</v>
+            <v>157042</v>
         </e>
         <e>
             <k>@plus_expr</k>
@@ -886,11 +886,11 @@
         </e>
         <e>
             <k>@recursive_pattern_expr</k>
-            <v>3150</v>
+            <v>3146</v>
         </e>
         <e>
             <k>@property_pattern_expr</k>
-            <v>2543</v>
+            <v>2533</v>
         </e>
         <e>
             <k>@positional_pattern_expr</k>
@@ -898,7 +898,7 @@
         </e>
         <e>
             <k>@switch_case_expr</k>
-            <v>660643</v>
+            <v>660636</v>
         </e>
         <e>
             <k>@assign_coalesce_expr</k>
@@ -906,7 +906,7 @@
         </e>
         <e>
             <k>@suppress_nullable_warning_expr</k>
-            <v>25801</v>
+            <v>25799</v>
         </e>
         <e>
             <k>@namespace_access_expr</k>
@@ -930,7 +930,7 @@
         </e>
         <e>
             <k>@not_pattern_expr</k>
-            <v>2910</v>
+            <v>2909</v>
         </e>
         <e>
             <k>@and_pattern_expr</k>
@@ -938,7 +938,7 @@
         </e>
         <e>
             <k>@or_pattern_expr</k>
-            <v>2477</v>
+            <v>2476</v>
         </e>
         <e>
             <k>@function_pointer_invocation_expr</k>
@@ -956,17 +956,25 @@
             <k>@slice_pattern_expr</k>
             <v>18</v>
         </e>
+        <e>
+            <k>@urshift_expr</k>
+            <v>50</v>
+        </e>
+        <e>
+            <k>@assign_urshift_expr</k>
+            <v>2</v>
+        </e>
         <e>
             <k>@xmldtd</k>
             <v>58</v>
         </e>
         <e>
             <k>@xmlelement</k>
-            <v>60596893</v>
+            <v>60596686</v>
         </e>
         <e>
             <k>@xmlattribute</k>
-            <v>41517960</v>
+            <v>41517819</v>
         </e>
         <e>
             <k>@xmlnamespace</k>
@@ -978,23 +986,23 @@
         </e>
         <e>
             <k>@xmlcharacters</k>
-            <v>45379511</v>
+            <v>45379357</v>
         </e>
         <e>
             <k>@singlelinecomment</k>
-            <v>673827</v>
+            <v>673821</v>
         </e>
         <e>
             <k>@xmldoccomment</k>
-            <v>1226196</v>
+            <v>1226185</v>
         </e>
         <e>
             <k>@multilinecomment</k>
-            <v>82948</v>
+            <v>82947</v>
         </e>
         <e>
             <k>@commentblock</k>
-            <v>374970</v>
+            <v>374967</v>
         </e>
         <e>
             <k>@asp_close_tag</k>
@@ -1022,7 +1030,7 @@
         </e>
         <e>
             <k>@asp_quoted_string</k>
-            <v>47186</v>
+            <v>47185</v>
         </e>
         <e>
             <k>@asp_text</k>
@@ -1034,15 +1042,15 @@
         </e>
         <e>
             <k>@cil_valueorreftype</k>
-            <v>10427087</v>
+            <v>10426990</v>
         </e>
         <e>
             <k>@cil_typeparameter</k>
-            <v>1773609</v>
+            <v>1773592</v>
         </e>
         <e>
             <k>@cil_array_type</k>
-            <v>181790</v>
+            <v>181788</v>
         </e>
         <e>
             <k>@cil_pointer_type</k>
@@ -1050,135 +1058,139 @@
         </e>
         <e>
             <k>@cil_function_pointer_type</k>
-            <v>39912</v>
+            <v>39911</v>
+        </e>
+        <e>
+            <k>@cil_method</k>
+            <v>39373409</v>
         </e>
         <e>
             <k>@cil_nop</k>
-            <v>1327129</v>
+            <v>1327046</v>
         </e>
         <e>
             <k>@cil_ldarg_0</k>
-            <v>53581819</v>
+            <v>53581318</v>
         </e>
         <e>
             <k>@cil_ldarg_1</k>
-            <v>20969699</v>
+            <v>20969503</v>
         </e>
         <e>
             <k>@cil_ldarg_2</k>
-            <v>7471514</v>
+            <v>7471444</v>
         </e>
         <e>
             <k>@cil_ldarg_3</k>
-            <v>3234755</v>
+            <v>3234725</v>
         </e>
         <e>
             <k>@cil_ldloc_0</k>
-            <v>17598601</v>
+            <v>17598436</v>
         </e>
         <e>
             <k>@cil_ldloc_1</k>
-            <v>9495219</v>
+            <v>9495130</v>
         </e>
         <e>
             <k>@cil_ldloc_2</k>
-            <v>6739302</v>
+            <v>6739239</v>
         </e>
         <e>
             <k>@cil_ldloc_3</k>
-            <v>4230971</v>
+            <v>4230931</v>
         </e>
         <e>
             <k>@cil_stloc_0</k>
-            <v>8735189</v>
+            <v>8735107</v>
         </e>
         <e>
             <k>@cil_stloc_1</k>
-            <v>5003935</v>
+            <v>5003888</v>
         </e>
         <e>
             <k>@cil_stloc_2</k>
-            <v>3618151</v>
+            <v>3618117</v>
         </e>
         <e>
             <k>@cil_stloc_3</k>
-            <v>2480277</v>
+            <v>2480254</v>
         </e>
         <e>
             <k>@cil_ldarg_s</k>
-            <v>3414862</v>
+            <v>3414830</v>
         </e>
         <e>
             <k>@cil_ldarga_s</k>
-            <v>1248318</v>
+            <v>1248307</v>
         </e>
         <e>
             <k>@cil_starg_s</k>
-            <v>270382</v>
+            <v>270379</v>
         </e>
         <e>
             <k>@cil_ldloc_s</k>
-            <v>14457162</v>
+            <v>14457027</v>
         </e>
         <e>
             <k>@cil_ldloca_s</k>
-            <v>9786184</v>
+            <v>9786093</v>
         </e>
         <e>
             <k>@cil_stloc_s</k>
-            <v>9038705</v>
+            <v>9038620</v>
         </e>
         <e>
             <k>@cil_ldnull</k>
-            <v>5794381</v>
+            <v>5794327</v>
         </e>
         <e>
             <k>@cil_ldc_i4_m1</k>
-            <v>871537</v>
+            <v>871529</v>
         </e>
         <e>
             <k>@cil_ldc_i4_0</k>
-            <v>10862959</v>
+            <v>10862858</v>
         </e>
         <e>
             <k>@cil_ldc_i4_1</k>
-            <v>8606701</v>
+            <v>8606621</v>
         </e>
         <e>
             <k>@cil_ldc_i4_2</k>
-            <v>1948578</v>
+            <v>1948560</v>
         </e>
         <e>
             <k>@cil_ldc_i4_3</k>
-            <v>1073526</v>
+            <v>1073516</v>
         </e>
         <e>
             <k>@cil_ldc_i4_4</k>
-            <v>985880</v>
+            <v>985870</v>
         </e>
         <e>
             <k>@cil_ldc_i4_5</k>
-            <v>578416</v>
+            <v>578411</v>
         </e>
         <e>
             <k>@cil_ldc_i4_6</k>
-            <v>334080</v>
+            <v>334076</v>
         </e>
         <e>
             <k>@cil_ldc_i4_7</k>
-            <v>296812</v>
+            <v>296809</v>
         </e>
         <e>
             <k>@cil_ldc_i4_8</k>
-            <v>444583</v>
+            <v>444579</v>
         </e>
         <e>
             <k>@cil_ldc_i4_s</k>
-            <v>5378885</v>
+            <v>5378835</v>
         </e>
         <e>
             <k>@cil_ldc_i4</k>
-            <v>2836653</v>
+            <v>2836626</v>
         </e>
         <e>
             <k>@cil_ldc_i8</k>
@@ -1186,23 +1198,23 @@
         </e>
         <e>
             <k>@cil_ldc_r4</k>
-            <v>31066</v>
+            <v>31065</v>
         </e>
         <e>
             <k>@cil_ldc_r8</k>
-            <v>238341</v>
+            <v>238339</v>
         </e>
         <e>
             <k>@cil_dup</k>
-            <v>9272617</v>
+            <v>9272530</v>
         </e>
         <e>
             <k>@cil_pop</k>
-            <v>3880176</v>
+            <v>3880140</v>
         </e>
         <e>
             <k>@cil_call</k>
-            <v>48855176</v>
+            <v>48854719</v>
         </e>
         <e>
             <k>@cil_calli</k>
@@ -1210,43 +1222,43 @@
         </e>
         <e>
             <k>@cil_ret</k>
-            <v>31661234</v>
+            <v>31660937</v>
         </e>
         <e>
             <k>@cil_br_s</k>
-            <v>5776958</v>
+            <v>5776904</v>
         </e>
         <e>
             <k>@cil_brfalse_s</k>
-            <v>10010144</v>
+            <v>10010051</v>
         </e>
         <e>
             <k>@cil_brtrue_s</k>
-            <v>9349219</v>
+            <v>9349132</v>
         </e>
         <e>
             <k>@cil_beq_s</k>
-            <v>1588452</v>
+            <v>1588437</v>
         </e>
         <e>
             <k>@cil_bge_s</k>
-            <v>302364</v>
+            <v>302361</v>
         </e>
         <e>
             <k>@cil_bgt_s</k>
-            <v>237898</v>
+            <v>237896</v>
         </e>
         <e>
             <k>@cil_ble_s</k>
-            <v>342112</v>
+            <v>342109</v>
         </e>
         <e>
             <k>@cil_blt_s</k>
-            <v>581015</v>
+            <v>581009</v>
         </e>
         <e>
             <k>@cil_bne_un_s</k>
-            <v>2310181</v>
+            <v>2310159</v>
         </e>
         <e>
             <k>@cil_bge_un_s</k>
@@ -1254,11 +1266,11 @@
         </e>
         <e>
             <k>@cil_bgt_un_s</k>
-            <v>101083</v>
+            <v>101082</v>
         </e>
         <e>
             <k>@cil_ble_un_s</k>
-            <v>98691</v>
+            <v>98690</v>
         </e>
         <e>
             <k>@cil_blt_un_s</k>
@@ -1266,23 +1278,23 @@
         </e>
         <e>
             <k>@cil_br</k>
-            <v>1432176</v>
+            <v>1432163</v>
         </e>
         <e>
             <k>@cil_brfalse</k>
-            <v>953957</v>
+            <v>953948</v>
         </e>
         <e>
             <k>@cil_brtrue</k>
-            <v>803794</v>
+            <v>803786</v>
         </e>
         <e>
             <k>@cil_beq</k>
-            <v>420014</v>
+            <v>420010</v>
         </e>
         <e>
             <k>@cil_bge</k>
-            <v>34905</v>
+            <v>34904</v>
         </e>
         <e>
             <k>@cil_bgt</k>
@@ -1294,11 +1306,11 @@
         </e>
         <e>
             <k>@cil_blt</k>
-            <v>95206</v>
+            <v>95205</v>
         </e>
         <e>
             <k>@cil_bne_un</k>
-            <v>210730</v>
+            <v>210728</v>
         </e>
         <e>
             <k>@cil_bge_un</k>
@@ -1318,7 +1330,7 @@
         </e>
         <e>
             <k>@cil_switch</k>
-            <v>272685</v>
+            <v>272683</v>
         </e>
         <e>
             <k>@cil_ldind_i1</k>
@@ -1326,7 +1338,7 @@
         </e>
         <e>
             <k>@cil_ldind_u1</k>
-            <v>90068</v>
+            <v>90067</v>
         </e>
         <e>
             <k>@cil_ldind_u2</k>
@@ -1334,7 +1346,7 @@
         </e>
         <e>
             <k>@cil_ldind_i4</k>
-            <v>219353</v>
+            <v>219351</v>
         </e>
         <e>
             <k>@cil_ldind_u4</k>
@@ -1354,15 +1366,15 @@
         </e>
         <e>
             <k>@cil_ldind_ref</k>
-            <v>190974</v>
+            <v>190972</v>
         </e>
         <e>
             <k>@cil_stind_ref</k>
-            <v>325516</v>
+            <v>325513</v>
         </e>
         <e>
             <k>@cil_stind_i1</k>
-            <v>144847</v>
+            <v>144846</v>
         </e>
         <e>
             <k>@cil_stind_i2</k>
@@ -1370,7 +1382,7 @@
         </e>
         <e>
             <k>@cil_stind_i4</k>
-            <v>441482</v>
+            <v>441478</v>
         </e>
         <e>
             <k>@cil_stind_i8</k>
@@ -1386,19 +1398,19 @@
         </e>
         <e>
             <k>@cil_add</k>
-            <v>2691805</v>
+            <v>2691780</v>
         </e>
         <e>
             <k>@cil_sub</k>
-            <v>1007112</v>
+            <v>1007103</v>
         </e>
         <e>
             <k>@cil_mul</k>
-            <v>426481</v>
+            <v>426477</v>
         </e>
         <e>
             <k>@cil_div</k>
-            <v>85048</v>
+            <v>85047</v>
         </e>
         <e>
             <k>@cil_div_un</k>
@@ -1414,31 +1426,31 @@
         </e>
         <e>
             <k>@cil_and</k>
-            <v>506036</v>
+            <v>506032</v>
         </e>
         <e>
             <k>@cil_or</k>
-            <v>225791</v>
+            <v>225789</v>
         </e>
         <e>
             <k>@cil_xor</k>
-            <v>192185</v>
+            <v>192183</v>
         </e>
         <e>
             <k>@cil_shl</k>
-            <v>118122</v>
+            <v>118121</v>
         </e>
         <e>
             <k>@cil_shr</k>
-            <v>60626</v>
+            <v>60625</v>
         </e>
         <e>
             <k>@cil_shr_un</k>
-            <v>114815</v>
+            <v>114814</v>
         </e>
         <e>
             <k>@cil_neg</k>
-            <v>29501</v>
+            <v>29500</v>
         </e>
         <e>
             <k>@cil_not</k>
@@ -1454,11 +1466,11 @@
         </e>
         <e>
             <k>@cil_conv_i4</k>
-            <v>534002</v>
+            <v>533997</v>
         </e>
         <e>
             <k>@cil_conv_i8</k>
-            <v>309038</v>
+            <v>309035</v>
         </e>
         <e>
             <k>@cil_conv_r4</k>
@@ -1474,11 +1486,11 @@
         </e>
         <e>
             <k>@cil_conv_u8</k>
-            <v>142987</v>
+            <v>142985</v>
         </e>
         <e>
             <k>@cil_callvirt</k>
-            <v>41217611</v>
+            <v>41217225</v>
         </e>
         <e>
             <k>@cil_cpobj</k>
@@ -1486,23 +1498,23 @@
         </e>
         <e>
             <k>@cil_ldobj</k>
-            <v>163865</v>
+            <v>163863</v>
         </e>
         <e>
             <k>@cil_ldstr</k>
-            <v>11254978</v>
+            <v>11254873</v>
         </e>
         <e>
             <k>@cil_newobj</k>
-            <v>12728409</v>
+            <v>12728290</v>
         </e>
         <e>
             <k>@cil_castclass</k>
-            <v>1803967</v>
+            <v>1803950</v>
         </e>
         <e>
             <k>@cil_isinst</k>
-            <v>2744724</v>
+            <v>2744698</v>
         </e>
         <e>
             <k>@cil_conv_r_un</k>
@@ -1514,23 +1526,23 @@
         </e>
         <e>
             <k>@cil_throw</k>
-            <v>1827943</v>
+            <v>1827881</v>
         </e>
         <e>
             <k>@cil_ldfld</k>
-            <v>23008966</v>
+            <v>23008751</v>
         </e>
         <e>
             <k>@cil_ldflda</k>
-            <v>1951443</v>
+            <v>1951424</v>
         </e>
         <e>
             <k>@cil_stfld</k>
-            <v>11363976</v>
+            <v>11363870</v>
         </e>
         <e>
             <k>@cil_ldsfld</k>
-            <v>10513996</v>
+            <v>10513898</v>
         </e>
         <e>
             <k>@cil_ldsflda</k>
@@ -1538,7 +1550,7 @@
         </e>
         <e>
             <k>@cil_stsfld</k>
-            <v>2599167</v>
+            <v>2599143</v>
         </e>
         <e>
             <k>@cil_stobj</k>
@@ -1546,19 +1558,19 @@
         </e>
         <e>
             <k>@cil_box</k>
-            <v>1419832</v>
+            <v>1419819</v>
         </e>
         <e>
             <k>@cil_newarr</k>
-            <v>1603690</v>
+            <v>1603675</v>
         </e>
         <e>
             <k>@cil_ldlen</k>
-            <v>570295</v>
+            <v>570290</v>
         </e>
         <e>
             <k>@cil_ldelema</k>
-            <v>714434</v>
+            <v>714427</v>
         </e>
         <e>
             <k>@cil_ldelem_i1</k>
@@ -1566,7 +1578,7 @@
         </e>
         <e>
             <k>@cil_ldelem_u1</k>
-            <v>104863</v>
+            <v>104862</v>
         </e>
         <e>
             <k>@cil_ldelem_i2</k>
@@ -1578,15 +1590,15 @@
         </e>
         <e>
             <k>@cil_ldelem_i4</k>
-            <v>158254</v>
+            <v>158253</v>
         </e>
         <e>
             <k>@cil_ldelem_u4</k>
-            <v>130732</v>
+            <v>130730</v>
         </e>
         <e>
             <k>@cil_ldelem_i8</k>
-            <v>64583</v>
+            <v>64582</v>
         </e>
         <e>
             <k>@cil_ldelem_i</k>
@@ -1602,7 +1614,7 @@
         </e>
         <e>
             <k>@cil_ldelem_ref</k>
-            <v>344799</v>
+            <v>344796</v>
         </e>
         <e>
             <k>@cil_stelem_i</k>
@@ -1610,7 +1622,7 @@
         </e>
         <e>
             <k>@cil_stelem_i1</k>
-            <v>75244</v>
+            <v>75243</v>
         </e>
         <e>
             <k>@cil_stelem_i2</k>
@@ -1618,11 +1630,11 @@
         </e>
         <e>
             <k>@cil_stelem_i4</k>
-            <v>173108</v>
+            <v>173106</v>
         </e>
         <e>
             <k>@cil_stelem_i8</k>
-            <v>31007</v>
+            <v>31006</v>
         </e>
         <e>
             <k>@cil_stelem_r8</k>
@@ -1630,19 +1642,19 @@
         </e>
         <e>
             <k>@cil_stelem_ref</k>
-            <v>4221551</v>
+            <v>4221511</v>
         </e>
         <e>
             <k>@cil_ldelem</k>
-            <v>35909</v>
+            <v>35908</v>
         </e>
         <e>
             <k>@cil_stelem</k>
-            <v>208190</v>
+            <v>208188</v>
         </e>
         <e>
             <k>@cil_unbox_any</k>
-            <v>227651</v>
+            <v>227649</v>
         </e>
         <e>
             <k>@cil_conv_ovf_u1</k>
@@ -1658,7 +1670,7 @@
         </e>
         <e>
             <k>@cil_ldtoken</k>
-            <v>1020371</v>
+            <v>1020362</v>
         </e>
         <e>
             <k>@cil_conv_u2</k>
@@ -1666,11 +1678,11 @@
         </e>
         <e>
             <k>@cil_conv_u1</k>
-            <v>238253</v>
+            <v>238250</v>
         </e>
         <e>
             <k>@cil_conv_i</k>
-            <v>34285</v>
+            <v>34284</v>
         </e>
         <e>
             <k>@cil_conv_ovf_i</k>
@@ -1690,15 +1702,15 @@
         </e>
         <e>
             <k>@cil_endfinally</k>
-            <v>1967891</v>
+            <v>1967873</v>
         </e>
         <e>
             <k>@cil_leave</k>
-            <v>692729</v>
+            <v>692723</v>
         </e>
         <e>
             <k>@cil_leave_s</k>
-            <v>3134203</v>
+            <v>3134174</v>
         </e>
         <e>
             <k>@cil_stind_i</k>
@@ -1706,11 +1718,11 @@
         </e>
         <e>
             <k>@cil_conv_u</k>
-            <v>114135</v>
+            <v>114134</v>
         </e>
         <e>
             <k>@cil_ceq</k>
-            <v>930037</v>
+            <v>930028</v>
         </e>
         <e>
             <k>@cil_cgt</k>
@@ -1718,11 +1730,11 @@
         </e>
         <e>
             <k>@cil_cgt_un</k>
-            <v>355253</v>
+            <v>355250</v>
         </e>
         <e>
             <k>@cil_clt</k>
-            <v>75775</v>
+            <v>75774</v>
         </e>
         <e>
             <k>@cil_clt_un</k>
@@ -1730,7 +1742,7 @@
         </e>
         <e>
             <k>@cil_ldftn</k>
-            <v>2883016</v>
+            <v>2882989</v>
         </e>
         <e>
             <k>@cil_ldvirtftn</k>
@@ -1762,15 +1774,15 @@
         </e>
         <e>
             <k>@cil_volatile</k>
-            <v>55222</v>
+            <v>55221</v>
         </e>
         <e>
             <k>@cil_initobj</k>
-            <v>950709</v>
+            <v>950700</v>
         </e>
         <e>
             <k>@cil_constrained</k>
-            <v>758376</v>
+            <v>758368</v>
         </e>
         <e>
             <k>@cil_cpblk</k>
@@ -1782,7 +1794,7 @@
         </e>
         <e>
             <k>@cil_rethrow</k>
-            <v>72025</v>
+            <v>72024</v>
         </e>
         <e>
             <k>@cil_sizeof</k>
@@ -1914,7 +1926,7 @@
         </e>
         <e>
             <k>@cil_ldloca</k>
-            <v>78758</v>
+            <v>78757</v>
         </e>
         <e>
             <k>@cil_tail</k>
@@ -1924,37 +1936,33 @@
             <k>@cil_refanytype</k>
             <v>13</v>
         </e>
-        <e>
-            <k>@cil_method</k>
-            <v>39373777</v>
-        </e>
         <e>
             <k>@cil_method_implementation</k>
-            <v>27073001</v>
+            <v>27072747</v>
         </e>
         <e>
             <k>@cil_field</k>
-            <v>15899467</v>
+            <v>15899318</v>
         </e>
         <e>
             <k>@cil_parameter</k>
-            <v>75119038</v>
-        </e>
-        <e>
-            <k>@cil_property</k>
-            <v>6002749</v>
+            <v>75118336</v>
         </e>
         <e>
             <k>@cil_event</k>
-            <v>70696</v>
+            <v>70695</v>
+        </e>
+        <e>
+            <k>@cil_property</k>
+            <v>6002693</v>
         </e>
         <e>
             <k>@cil_local_variable</k>
-            <v>23026507</v>
+            <v>23026292</v>
         </e>
         <e>
             <k>@cil_catch_handler</k>
-            <v>400819</v>
+            <v>400815</v>
         </e>
         <e>
             <k>@cil_filter_handler</k>
@@ -1962,15 +1970,15 @@
         </e>
         <e>
             <k>@cil_finally_handler</k>
-            <v>1662456</v>
+            <v>1662440</v>
         </e>
         <e>
             <k>@cil_fault_handler</k>
-            <v>305435</v>
+            <v>305432</v>
         </e>
         <e>
             <k>@cil_attribute</k>
-            <v>5874527</v>
+            <v>5874473</v>
         </e>
     </typesizes>
     <stats>
@@ -2320,7 +2328,7 @@
         </relation>
         <relation>
             <name>compilation_compiling_files</name>
-            <cardinality>49881</cardinality>
+            <cardinality>49880</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -2640,7 +2648,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>49836</v>
+                                    <v>49835</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -2661,7 +2669,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>49836</v>
+                                    <v>49835</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -2676,7 +2684,7 @@
         </relation>
         <relation>
             <name>compilation_referencing_files</name>
-            <cardinality>719519</cardinality>
+            <cardinality>719512</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -2910,57 +2918,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>5</b>
-                                    <v>630</v>
+                                    <v>574</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>1159</v>
+                                    <v>1148</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>900</v>
+                                    <v>957</v>
                                 </b>
                                 <b>
                                     <a>7</a>
-                                    <b>22</b>
+                                    <b>21</b>
+                                    <v>540</v>
+                                </b>
+                                <b>
+                                    <a>21</a>
+                                    <b>27</b>
                                     <v>574</v>
                                 </b>
                                 <b>
-                                    <a>22</a>
-                                    <b>28</b>
-                                    <v>574</v>
+                                    <a>27</a>
+                                    <b>32</b>
+                                    <v>540</v>
                                 </b>
                                 <b>
-                                    <a>28</a>
-                                    <b>35</b>
-                                    <v>517</v>
-                                </b>
-                                <b>
-                                    <a>35</a>
+                                    <a>32</a>
                                     <b>42</b>
                                     <v>529</v>
                                 </b>
                                 <b>
-                                    <a>42</a>
-                                    <b>58</b>
+                                    <a>43</a>
+                                    <b>59</b>
                                     <v>551</v>
                                 </b>
                                 <b>
-                                    <a>58</a>
-                                    <b>67</b>
-                                    <v>608</v>
+                                    <a>59</a>
+                                    <b>66</b>
+                                    <v>495</v>
                                 </b>
                                 <b>
-                                    <a>67</a>
-                                    <b>70</b>
+                                    <a>66</a>
+                                    <b>69</b>
+                                    <v>506</v>
+                                </b>
+                                <b>
+                                    <a>69</a>
+                                    <b>73</b>
                                     <v>585</v>
                                 </b>
                                 <b>
-                                    <a>70</a>
-                                    <b>77</b>
-                                    <v>416</v>
+                                    <a>73</a>
+                                    <b>82</b>
+                                    <v>45</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3037,62 +3050,62 @@
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>585</v>
+                                    <v>562</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>630</v>
+                                    <v>495</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>641</v>
+                                    <v>788</v>
                                 </b>
                                 <b>
                                     <a>7</a>
-                                    <b>10</b>
+                                    <b>9</b>
+                                    <v>596</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>19</b>
                                     <v>675</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
-                                    <b>20</b>
-                                    <v>686</v>
-                                </b>
-                                <b>
-                                    <a>20</a>
-                                    <b>28</b>
-                                    <v>675</v>
-                                </b>
-                                <b>
-                                    <a>28</a>
-                                    <b>35</b>
-                                    <v>619</v>
-                                </b>
-                                <b>
-                                    <a>35</a>
-                                    <b>51</b>
+                                    <a>19</a>
+                                    <b>25</b>
                                     <v>574</v>
                                 </b>
                                 <b>
-                                    <a>51</a>
-                                    <b>68</b>
-                                    <v>439</v>
+                                    <a>25</a>
+                                    <b>32</b>
+                                    <v>596</v>
                                 </b>
                                 <b>
-                                    <a>68</a>
-                                    <b>70</b>
-                                    <v>484</v>
+                                    <a>32</a>
+                                    <b>38</b>
+                                    <v>608</v>
                                 </b>
                                 <b>
-                                    <a>70</a>
+                                    <a>38</a>
+                                    <b>67</b>
+                                    <v>517</v>
+                                </b>
+                                <b>
+                                    <a>67</a>
+                                    <b>69</b>
+                                    <v>517</v>
+                                </b>
+                                <b>
+                                    <a>69</a>
                                     <b>72</b>
-                                    <v>574</v>
+                                    <v>630</v>
                                 </b>
                                 <b>
                                     <a>72</a>
-                                    <b>78</b>
-                                    <v>304</v>
+                                    <b>77</b>
+                                    <v>326</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3118,7 +3131,7 @@
                 </e>
                 <e>
                     <k>seconds</k>
-                    <v>11226</v>
+                    <v>11530</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -3164,12 +3177,12 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>11</v>
+                                    <v>22</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>2206</v>
+                                    <v>2195</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3215,8 +3228,8 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>997</a>
-                                    <b>998</b>
+                                    <a>1024</a>
+                                    <b>1025</b>
                                     <v>11</v>
                                 </b>
                             </bs>
@@ -3263,19 +3276,24 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>138</a>
-                                    <b>139</b>
+                                    <a>143</a>
+                                    <b>144</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>144</a>
-                                    <b>145</b>
+                                    <a>146</a>
+                                    <b>147</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>152</a>
-                                    <b>153</b>
-                                    <v>22</v>
+                                    <a>155</a>
+                                    <b>156</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>157</a>
+                                    <b>158</b>
+                                    <v>11</v>
                                 </b>
                                 <b>
                                     <a>197</a>
@@ -3296,7 +3314,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9007</v>
+                                    <v>9345</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -3306,12 +3324,12 @@
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>945</v>
+                                    <v>1035</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>10</b>
-                                    <v>247</v>
+                                    <b>8</b>
+                                    <v>123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3327,7 +3345,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11226</v>
+                                    <v>11530</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3343,17 +3361,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9570</v>
+                                    <v>9874</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1328</v>
+                                    <v>1429</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>326</v>
+                                    <v>225</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4412,7 +4430,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31693</v>
+                                    <v>31692</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -4481,7 +4499,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31693</v>
+                                    <v>31692</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -4539,7 +4557,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40646</v>
+                                    <v>40645</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -4560,7 +4578,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40646</v>
+                                    <v>40645</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -4581,7 +4599,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40646</v>
+                                    <v>40645</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5357,7 +5375,7 @@
                 </e>
                 <e>
                     <k>cpu_seconds</k>
-                    <v>1936</v>
+                    <v>2060</v>
                 </e>
                 <e>
                     <k>elapsed_seconds</k>
@@ -5407,17 +5425,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1666</v>
+                                    <v>1925</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>3</b>
-                                    <v>258</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
                                     <b>4</b>
-                                    <v>11</v>
+                                    <v>135</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5433,17 +5446,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1666</v>
+                                    <v>1925</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>3</b>
-                                    <v>258</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
                                     <b>4</b>
-                                    <v>11</v>
+                                    <v>135</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5688,19 +5696,19 @@
         </relation>
         <relation>
             <name>locations_default</name>
-            <cardinality>137912010</cardinality>
+            <cardinality>137911541</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>137912010</v>
+                    <v>137911541</v>
                 </e>
                 <e>
                     <k>file</k>
-                    <v>73412</v>
+                    <v>73411</v>
                 </e>
                 <e>
                     <k>beginLine</k>
-                    <v>328702</v>
+                    <v>328701</v>
                 </e>
                 <e>
                     <k>beginColumn</k>
@@ -5708,7 +5716,7 @@
                 </e>
                 <e>
                     <k>endLine</k>
-                    <v>331303</v>
+                    <v>331302</v>
                 </e>
                 <e>
                     <k>endColumn</k>
@@ -5726,7 +5734,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>137912010</v>
+                                    <v>137911541</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5742,7 +5750,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>137912010</v>
+                                    <v>137911541</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5758,7 +5766,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>137912010</v>
+                                    <v>137911541</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5774,7 +5782,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>137912010</v>
+                                    <v>137911541</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5790,7 +5798,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>137912010</v>
+                                    <v>137911541</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5963,7 +5971,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>6</b>
-                                    <v>5045</v>
+                                    <v>5044</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -6099,7 +6107,7 @@
                                 <b>
                                     <a>2417</a>
                                     <b>135652</b>
-                                    <v>5197</v>
+                                    <v>5196</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6196,7 +6204,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>21425</v>
+                                    <v>21424</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -6520,7 +6528,7 @@
                                 <b>
                                     <a>57</a>
                                     <b>78</b>
-                                    <v>24880</v>
+                                    <v>24879</v>
                                 </b>
                                 <b>
                                     <a>78</a>
@@ -6953,7 +6961,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>76464</v>
+                                    <v>76463</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -7151,7 +7159,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10090</v>
+                                    <v>10089</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -7345,15 +7353,15 @@
         </relation>
         <relation>
             <name>locations_mapped</name>
-            <cardinality>135223</cardinality>
+            <cardinality>135221</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>135223</v>
+                    <v>135221</v>
                 </e>
                 <e>
                     <k>mapped_to</k>
-                    <v>83194</v>
+                    <v>83193</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7367,7 +7375,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>135223</v>
+                                    <v>135221</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7383,7 +7391,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31212</v>
+                                    <v>31211</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -7403,11 +7411,11 @@
         </relation>
         <relation>
             <name>numlines</name>
-            <cardinality>60897147</cardinality>
+            <cardinality>60896940</cardinality>
             <columnsizes>
                 <e>
                     <k>element_id</k>
-                    <v>60897038</v>
+                    <v>60896831</v>
                 </e>
                 <e>
                     <k>num_lines</k>
@@ -7433,7 +7441,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>60896930</v>
+                                    <v>60896723</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -7454,7 +7462,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>60896932</v>
+                                    <v>60896725</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -7475,7 +7483,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>60897026</v>
+                                    <v>60896819</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -8076,7 +8084,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14588</v>
+                                    <v>14587</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -8097,7 +8105,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14588</v>
+                                    <v>14587</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -8150,7 +8158,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14588</v>
+                                    <v>14587</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -8171,7 +8179,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14588</v>
+                                    <v>14587</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -8382,15 +8390,15 @@
         </relation>
         <relation>
             <name>files</name>
-            <cardinality>106541</cardinality>
+            <cardinality>106540</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>106541</v>
+                    <v>106540</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>106541</v>
+                    <v>106540</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8404,7 +8412,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>106541</v>
+                                    <v>106540</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8420,7 +8428,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>106541</v>
+                                    <v>106540</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8478,7 +8486,7 @@
         </relation>
         <relation>
             <name>containerparent</name>
-            <cardinality>143755</cardinality>
+            <cardinality>143753</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
@@ -8486,7 +8494,7 @@
                 </e>
                 <e>
                     <k>child</k>
-                    <v>143755</v>
+                    <v>143753</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8546,7 +8554,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>143755</v>
+                                    <v>143753</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8604,15 +8612,15 @@
         </relation>
         <relation>
             <name>namespaces</name>
-            <cardinality>500337</cardinality>
+            <cardinality>500332</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>500337</v>
+                    <v>500332</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>86288</v>
+                    <v>86287</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8626,7 +8634,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>500337</v>
+                                    <v>500332</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8647,7 +8655,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>52830</v>
+                                    <v>52829</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -8692,11 +8700,11 @@
         </relation>
         <relation>
             <name>namespace_declarations</name>
-            <cardinality>42810</cardinality>
+            <cardinality>42809</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>42810</v>
+                    <v>42809</v>
                 </e>
                 <e>
                     <k>namespace_id</k>
@@ -8714,7 +8722,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>42810</v>
+                                    <v>42809</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8775,15 +8783,15 @@
         </relation>
         <relation>
             <name>namespace_declaration_location</name>
-            <cardinality>42810</cardinality>
+            <cardinality>42809</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>42810</v>
+                    <v>42809</v>
                 </e>
                 <e>
                     <k>loc</k>
-                    <v>42810</v>
+                    <v>42809</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8797,7 +8805,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>42810</v>
+                                    <v>42809</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8813,7 +8821,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>42810</v>
+                                    <v>42809</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8823,15 +8831,15 @@
         </relation>
         <relation>
             <name>parent_namespace</name>
-            <cardinality>9856437</cardinality>
+            <cardinality>9856345</cardinality>
             <columnsizes>
                 <e>
                     <k>child_id</k>
-                    <v>9856437</v>
+                    <v>9856345</v>
                 </e>
                 <e>
                     <k>namespace_id</k>
-                    <v>314826</v>
+                    <v>314823</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8845,7 +8853,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9856437</v>
+                                    <v>9856345</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8861,12 +8869,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>81977</v>
+                                    <v>81976</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>44857</v>
+                                    <v>44856</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -8876,7 +8884,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>21321</v>
+                                    <v>21320</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -8891,7 +8899,7 @@
                                 <b>
                                     <a>8</a>
                                     <b>12</b>
-                                    <v>28556</v>
+                                    <v>28555</v>
                                 </b>
                                 <b>
                                     <a>12</a>
@@ -8901,7 +8909,7 @@
                                 <b>
                                     <a>19</a>
                                     <b>44</b>
-                                    <v>23831</v>
+                                    <v>23830</v>
                                 </b>
                                 <b>
                                     <a>44</a>
@@ -8938,7 +8946,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53097</v>
+                                    <v>53096</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -8995,11 +9003,11 @@
         </relation>
         <relation>
             <name>using_namespace_directives</name>
-            <cardinality>223779</cardinality>
+            <cardinality>223777</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>223779</v>
+                    <v>223777</v>
                 </e>
                 <e>
                     <k>namespace_id</k>
@@ -9017,7 +9025,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>223779</v>
+                                    <v>223777</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9136,15 +9144,15 @@
         </relation>
         <relation>
             <name>using_directive_location</name>
-            <cardinality>223959</cardinality>
+            <cardinality>223957</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>223959</v>
+                    <v>223957</v>
                 </e>
                 <e>
                     <k>loc</k>
-                    <v>223846</v>
+                    <v>223844</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9158,7 +9166,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>223959</v>
+                                    <v>223957</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9174,7 +9182,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>223734</v>
+                                    <v>223732</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -9189,11 +9197,11 @@
         </relation>
         <relation>
             <name>directive_ifs</name>
-            <cardinality>16750</cardinality>
+            <cardinality>16749</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>16750</v>
+                    <v>16749</v>
                 </e>
                 <e>
                     <k>branchTaken</k>
@@ -9215,7 +9223,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16750</v>
+                                    <v>16749</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9231,7 +9239,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16750</v>
+                                    <v>16749</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10057,7 +10065,7 @@
                 </e>
                 <e>
                     <k>start</k>
-                    <v>16750</v>
+                    <v>16749</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10087,7 +10095,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16750</v>
+                                    <v>16749</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10097,11 +10105,11 @@
         </relation>
         <relation>
             <name>directive_define_symbols</name>
-            <cardinality>32513</cardinality>
+            <cardinality>32512</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>32513</v>
+                    <v>32512</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -10119,7 +10127,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>32513</v>
+                                    <v>32512</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11632,15 +11640,15 @@
         </relation>
         <relation>
             <name>preprocessor_directive_location</name>
-            <cardinality>79638</cardinality>
+            <cardinality>79637</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>79638</v>
+                    <v>79637</v>
                 </e>
                 <e>
                     <k>loc</k>
-                    <v>79638</v>
+                    <v>79637</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11654,7 +11662,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>79638</v>
+                                    <v>79637</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11670,7 +11678,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>79638</v>
+                                    <v>79637</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11680,11 +11688,11 @@
         </relation>
         <relation>
             <name>preprocessor_directive_compilation</name>
-            <cardinality>79638</cardinality>
+            <cardinality>79637</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>79638</v>
+                    <v>79637</v>
                 </e>
                 <e>
                     <k>compilation</k>
@@ -11702,7 +11710,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>79638</v>
+                                    <v>79637</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11753,11 +11761,11 @@
         </relation>
         <relation>
             <name>preprocessor_directive_active</name>
-            <cardinality>79638</cardinality>
+            <cardinality>79637</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>79638</v>
+                    <v>79637</v>
                 </e>
                 <e>
                     <k>active</k>
@@ -11775,7 +11783,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>79638</v>
+                                    <v>79637</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11806,11 +11814,11 @@
         </relation>
         <relation>
             <name>types</name>
-            <cardinality>11520193</cardinality>
+            <cardinality>11520085</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>11520193</v>
+                    <v>11520085</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -11818,7 +11826,7 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>3497046</v>
+                    <v>3497013</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11832,7 +11840,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11520193</v>
+                                    <v>11520085</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11848,7 +11856,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11520193</v>
+                                    <v>11520085</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11951,17 +11959,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3141586</v>
+                                    <v>3141557</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>274812</v>
+                                    <v>274809</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>21597</b>
-                                    <v>80648</v>
+                                    <v>80647</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11977,7 +11985,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3468460</v>
+                                    <v>3468428</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11992,15 +12000,15 @@
         </relation>
         <relation>
             <name>typerefs</name>
-            <cardinality>4815264</cardinality>
+            <cardinality>4815219</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4815264</v>
+                    <v>4815219</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>3370389</v>
+                    <v>3370358</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12014,7 +12022,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4815264</v>
+                                    <v>4815219</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12030,12 +12038,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3128415</v>
+                                    <v>3128386</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>11806</b>
-                                    <v>241973</v>
+                                    <v>241971</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12045,15 +12053,15 @@
         </relation>
         <relation>
             <name>typeref_type</name>
-            <cardinality>4775132</cardinality>
+            <cardinality>4775087</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4775132</v>
+                    <v>4775087</v>
                 </e>
                 <e>
                     <k>typeId</k>
-                    <v>4775132</v>
+                    <v>4775087</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12067,7 +12075,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4775132</v>
+                                    <v>4775087</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12083,7 +12091,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4775132</v>
+                                    <v>4775087</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12093,11 +12101,11 @@
         </relation>
         <relation>
             <name>array_element_type</name>
-            <cardinality>116793</cardinality>
+            <cardinality>116792</cardinality>
             <columnsizes>
                 <e>
                     <k>array</k>
-                    <v>116793</v>
+                    <v>116792</v>
                 </e>
                 <e>
                     <k>dimension</k>
@@ -12109,7 +12117,7 @@
                 </e>
                 <e>
                     <k>element</k>
-                    <v>116409</v>
+                    <v>116408</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12123,7 +12131,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>116793</v>
+                                    <v>116792</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12139,7 +12147,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>116793</v>
+                                    <v>116792</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12155,7 +12163,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>116793</v>
+                                    <v>116792</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12317,7 +12325,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>116084</v>
+                                    <v>116083</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12338,7 +12346,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>116409</v>
+                                    <v>116408</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12354,7 +12362,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>116084</v>
+                                    <v>116083</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12465,11 +12473,11 @@
         </relation>
         <relation>
             <name>enum_underlying_type</name>
-            <cardinality>204056</cardinality>
+            <cardinality>204054</cardinality>
             <columnsizes>
                 <e>
                     <k>enum_id</k>
-                    <v>204056</v>
+                    <v>204054</v>
                 </e>
                 <e>
                     <k>underlying_type_id</k>
@@ -12487,7 +12495,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>204056</v>
+                                    <v>204054</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12548,15 +12556,15 @@
         </relation>
         <relation>
             <name>delegate_return_type</name>
-            <cardinality>1214025</cardinality>
+            <cardinality>1214014</cardinality>
             <columnsizes>
                 <e>
                     <k>delegate_id</k>
-                    <v>1214025</v>
+                    <v>1214014</v>
                 </e>
                 <e>
                     <k>return_type_id</k>
-                    <v>609581</v>
+                    <v>609575</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12570,7 +12578,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1214025</v>
+                                    <v>1214014</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12586,12 +12594,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>578365</v>
+                                    <v>578359</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>2134</b>
-                                    <v>31216</v>
+                                    <v>31215</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12669,15 +12677,15 @@
         </relation>
         <relation>
             <name>extend</name>
-            <cardinality>3912749</cardinality>
+            <cardinality>3912712</cardinality>
             <columnsizes>
                 <e>
                     <k>sub</k>
-                    <v>3912749</v>
+                    <v>3912712</v>
                 </e>
                 <e>
                     <k>super</k>
-                    <v>608567</v>
+                    <v>608561</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12691,7 +12699,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3912749</v>
+                                    <v>3912712</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12707,12 +12715,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>412779</v>
+                                    <v>412775</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>97451</v>
+                                    <v>97450</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -12722,12 +12730,12 @@
                                 <b>
                                     <a>5</a>
                                     <b>107</b>
-                                    <v>45654</v>
+                                    <v>45653</v>
                                 </b>
                                 <b>
                                     <a>107</a>
                                     <b>31892</b>
-                                    <v>1447</v>
+                                    <v>1446</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12748,15 +12756,15 @@
         </relation>
         <relation>
             <name>implement</name>
-            <cardinality>12929395</cardinality>
+            <cardinality>12929274</cardinality>
             <columnsizes>
                 <e>
                     <k>sub</k>
-                    <v>4515705</v>
+                    <v>4515663</v>
                 </e>
                 <e>
                     <k>super</k>
-                    <v>2758958</v>
+                    <v>2758932</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12770,32 +12778,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1532610</v>
+                                    <v>1532595</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1232578</v>
+                                    <v>1232567</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>844694</v>
+                                    <v>844686</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>367567</v>
+                                    <v>367564</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>339011</v>
+                                    <v>339008</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>32</b>
-                                    <v>199243</v>
+                                    <v>199241</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12811,27 +12819,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1324507</v>
+                                    <v>1324495</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>815340</v>
+                                    <v>815333</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>236392</v>
+                                    <v>236390</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>215396</v>
+                                    <v>215394</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>90747</b>
-                                    <v>167320</v>
+                                    <v>167318</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12841,11 +12849,11 @@
         </relation>
         <relation>
             <name>type_location</name>
-            <cardinality>6161742</cardinality>
+            <cardinality>6161685</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6071408</v>
+                    <v>6071351</v>
                 </e>
                 <e>
                     <k>loc</k>
@@ -12863,7 +12871,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6041080</v>
+                                    <v>6041024</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12944,15 +12952,15 @@
         </relation>
         <relation>
             <name>tuple_underlying_type</name>
-            <cardinality>37858</cardinality>
+            <cardinality>37857</cardinality>
             <columnsizes>
                 <e>
                     <k>tuple</k>
-                    <v>37858</v>
+                    <v>37857</v>
                 </e>
                 <e>
                     <k>struct</k>
-                    <v>37858</v>
+                    <v>37857</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12966,7 +12974,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37858</v>
+                                    <v>37857</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12982,7 +12990,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37858</v>
+                                    <v>37857</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12992,7 +13000,7 @@
         </relation>
         <relation>
             <name>tuple_element</name>
-            <cardinality>99961</cardinality>
+            <cardinality>99960</cardinality>
             <columnsizes>
                 <e>
                     <k>tuple</k>
@@ -13004,7 +13012,7 @@
                 </e>
                 <e>
                     <k>field</k>
-                    <v>99961</v>
+                    <v>99960</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13322,7 +13330,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>99961</v>
+                                    <v>99960</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13338,7 +13346,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>99961</v>
+                                    <v>99960</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13348,11 +13356,11 @@
         </relation>
         <relation>
             <name>attributes</name>
-            <cardinality>14554229</cardinality>
+            <cardinality>14554093</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>14554229</v>
+                    <v>14554093</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -13364,7 +13372,7 @@
                 </e>
                 <e>
                     <k>target</k>
-                    <v>12720347</v>
+                    <v>12720228</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13378,7 +13386,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14554229</v>
+                                    <v>14554093</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13394,7 +13402,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14554229</v>
+                                    <v>14554093</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13410,7 +13418,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14554229</v>
+                                    <v>14554093</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13534,7 +13542,7 @@
                                 <b>
                                     <a>14</a>
                                     <b>23</b>
-                                    <v>1447</v>
+                                    <v>1446</v>
                                 </b>
                                 <b>
                                     <a>23</a>
@@ -13544,7 +13552,7 @@
                                 <b>
                                     <a>40</a>
                                     <b>86</b>
-                                    <v>1447</v>
+                                    <v>1446</v>
                                 </b>
                                 <b>
                                     <a>88</a>
@@ -13651,7 +13659,7 @@
                                 <b>
                                     <a>152</a>
                                     <b>380</b>
-                                    <v>1447</v>
+                                    <v>1446</v>
                                 </b>
                                 <b>
                                     <a>385</a>
@@ -13677,12 +13685,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11789749</v>
+                                    <v>11789638</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3520</b>
-                                    <v>930598</v>
+                                    <v>930589</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13698,7 +13706,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12664594</v>
+                                    <v>12664475</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13719,12 +13727,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11960465</v>
+                                    <v>11960353</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>29</b>
-                                    <v>759882</v>
+                                    <v>759875</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13734,11 +13742,11 @@
         </relation>
         <relation>
             <name>attribute_location</name>
-            <cardinality>14556089</cardinality>
+            <cardinality>14555953</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>14554229</v>
+                    <v>14554093</v>
                 </e>
                 <e>
                     <k>loc</k>
@@ -13756,7 +13764,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14552752</v>
+                                    <v>14552616</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13847,19 +13855,19 @@
         </relation>
         <relation>
             <name>type_mention</name>
-            <cardinality>2667838</cardinality>
+            <cardinality>2667808</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2667838</v>
+                    <v>2667808</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>76163</v>
+                    <v>76156</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>2110780</v>
+                    <v>2110766</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13873,7 +13881,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2667838</v>
+                                    <v>2667808</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13889,7 +13897,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2667838</v>
+                                    <v>2667808</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13905,17 +13913,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13028</v>
+                                    <v>13027</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>14823</v>
+                                    <v>14820</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>8378</v>
+                                    <v>8377</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -13930,7 +13938,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>5252</v>
+                                    <v>5251</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -13945,17 +13953,17 @@
                                 <b>
                                     <a>16</a>
                                     <b>36</b>
-                                    <v>5803</v>
+                                    <v>5802</v>
                                 </b>
                                 <b>
                                     <a>36</a>
-                                    <b>760</b>
-                                    <v>5714</v>
+                                    <b>758</b>
+                                    <v>5711</v>
                                 </b>
                                 <b>
-                                    <a>762</a>
+                                    <a>759</a>
                                     <b>97094</b>
-                                    <v>360</v>
+                                    <v>362</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13971,12 +13979,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>23361</v>
+                                    <v>23359</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12267</v>
+                                    <v>12264</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -13986,7 +13994,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>6013</v>
+                                    <v>6012</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -14001,7 +14009,7 @@
                                 <b>
                                     <a>8</a>
                                     <b>13</b>
-                                    <v>5964</v>
+                                    <v>5963</v>
                                 </b>
                                 <b>
                                     <a>13</a>
@@ -14010,13 +14018,13 @@
                                 </b>
                                 <b>
                                     <a>30</a>
-                                    <b>609</b>
-                                    <v>5714</v>
+                                    <b>607</b>
+                                    <v>5711</v>
                                 </b>
                                 <b>
-                                    <a>612</a>
-                                    <b>73794</b>
-                                    <v>383</v>
+                                    <a>608</a>
+                                    <b>73798</b>
+                                    <v>385</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14032,17 +14040,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1801358</v>
+                                    <v>1801339</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>219426</v>
+                                    <v>219408</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>613</b>
-                                    <v>89995</v>
+                                    <v>90019</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14058,12 +14066,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2067454</v>
+                                    <v>2067445</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>38</b>
-                                    <v>43325</v>
+                                    <v>43320</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14073,15 +14081,15 @@
         </relation>
         <relation>
             <name>type_mention_location</name>
-            <cardinality>2667838</cardinality>
+            <cardinality>2667808</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2667838</v>
+                    <v>2667808</v>
                 </e>
                 <e>
                     <k>loc</k>
-                    <v>2358635</v>
+                    <v>2358655</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14095,7 +14103,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2667838</v>
+                                    <v>2667808</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14111,12 +14119,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2217587</v>
+                                    <v>2217592</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>205</b>
-                                    <v>141048</v>
+                                    <v>141062</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14126,11 +14134,11 @@
         </relation>
         <relation>
             <name>type_annotation</name>
-            <cardinality>1259639</cardinality>
+            <cardinality>1259627</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1259639</v>
+                    <v>1259627</v>
                 </e>
                 <e>
                     <k>annotation</k>
@@ -14148,7 +14156,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1259639</v>
+                                    <v>1259627</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14543,15 +14551,15 @@
         </relation>
         <relation>
             <name>type_nullability</name>
-            <cardinality>44405235</cardinality>
+            <cardinality>44404820</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>44402076</v>
+                    <v>44401660</v>
                 </e>
                 <e>
                     <k>nullability</k>
-                    <v>28113</v>
+                    <v>28112</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14565,7 +14573,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>44399034</v>
+                                    <v>44398619</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14586,7 +14594,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10129</v>
+                                    <v>10128</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14596,7 +14604,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2894</v>
+                                    <v>2893</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -14636,11 +14644,11 @@
         </relation>
         <relation>
             <name>expr_flowstate</name>
-            <cardinality>5429110</cardinality>
+            <cardinality>5429197</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5429110</v>
+                    <v>5429197</v>
                 </e>
                 <e>
                     <k>state</k>
@@ -14658,7 +14666,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5429110</v>
+                                    <v>5429197</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14672,13 +14680,13 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>223701</a>
-                                    <b>223702</b>
+                                    <a>223736</a>
+                                    <b>223737</b>
                                     <v>2</v>
                                 </b>
                                 <b>
-                                    <a>2337771</a>
-                                    <b>2337772</b>
+                                    <a>2337938</a>
+                                    <b>2337939</b>
                                     <v>2</v>
                                 </b>
                             </bs>
@@ -14689,11 +14697,11 @@
         </relation>
         <relation>
             <name>type_parameters</name>
-            <cardinality>991372</cardinality>
+            <cardinality>991363</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>991372</v>
+                    <v>991363</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -14701,7 +14709,7 @@
                 </e>
                 <e>
                     <k>generic_id</k>
-                    <v>758317</v>
+                    <v>758309</v>
                 </e>
                 <e>
                     <k>variance</k>
@@ -14719,7 +14727,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>991372</v>
+                                    <v>991363</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14735,7 +14743,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>991372</v>
+                                    <v>991363</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14751,7 +14759,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>991372</v>
+                                    <v>991363</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14915,12 +14923,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>592797</v>
+                                    <v>592792</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>137258</v>
+                                    <v>137257</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -14941,12 +14949,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>592797</v>
+                                    <v>592792</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>137258</v>
+                                    <v>137257</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -14967,7 +14975,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>757135</v>
+                                    <v>757128</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15060,11 +15068,11 @@
         </relation>
         <relation>
             <name>type_arguments</name>
-            <cardinality>24843956</cardinality>
+            <cardinality>24843724</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>789924</v>
+                    <v>789917</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -15072,7 +15080,7 @@
                 </e>
                 <e>
                     <k>constructed_id</k>
-                    <v>2591723</v>
+                    <v>2591698</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -15086,17 +15094,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>216091</v>
+                                    <v>216089</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>548605</v>
+                                    <v>548600</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>25228</v>
+                                    <v>25227</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15112,22 +15120,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>82752</v>
+                                    <v>82751</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>587919</v>
+                                    <v>587914</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>10</b>
-                                    <v>61303</v>
+                                    <v>61302</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>3477</b>
-                                    <v>57949</v>
+                                    <v>57948</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15325,37 +15333,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>408050</v>
+                                    <v>408047</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1236259</v>
+                                    <v>1236248</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>19</b>
-                                    <v>213081</v>
+                                    <v>213079</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>24</b>
-                                    <v>198798</v>
+                                    <v>198796</v>
                                 </b>
                                 <b>
                                     <a>24</a>
                                     <b>28</b>
-                                    <v>230194</v>
+                                    <v>230192</v>
                                 </b>
                                 <b>
                                     <a>28</a>
                                     <b>31</b>
-                                    <v>221032</v>
+                                    <v>221030</v>
                                 </b>
                                 <b>
                                     <a>31</a>
                                     <b>33</b>
-                                    <v>84306</v>
+                                    <v>84305</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15371,37 +15379,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>403306</v>
+                                    <v>403302</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1238582</v>
+                                    <v>1238571</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>19</b>
-                                    <v>215502</v>
+                                    <v>215500</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>24</b>
-                                    <v>198798</v>
+                                    <v>198796</v>
                                 </b>
                                 <b>
                                     <a>24</a>
                                     <b>28</b>
-                                    <v>230194</v>
+                                    <v>230192</v>
                                 </b>
                                 <b>
                                     <a>28</a>
                                     <b>31</b>
-                                    <v>221032</v>
+                                    <v>221030</v>
                                 </b>
                                 <b>
                                     <a>31</a>
                                     <b>33</b>
-                                    <v>84306</v>
+                                    <v>84305</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15411,15 +15419,15 @@
         </relation>
         <relation>
             <name>constructed_generic</name>
-            <cardinality>5258135</cardinality>
+            <cardinality>5258085</cardinality>
             <columnsizes>
                 <e>
                     <k>constructed</k>
-                    <v>5258135</v>
+                    <v>5258085</v>
                 </e>
                 <e>
                     <k>generic</k>
-                    <v>108318</v>
+                    <v>108317</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -15433,7 +15441,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5258135</v>
+                                    <v>5258085</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15459,7 +15467,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>10631</v>
+                                    <v>10630</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -15489,7 +15497,7 @@
                                 <b>
                                     <a>149</a>
                                     <b>19826</b>
-                                    <v>3396</v>
+                                    <v>3395</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15499,15 +15507,15 @@
         </relation>
         <relation>
             <name>type_parameter_constraints</name>
-            <cardinality>991372</cardinality>
+            <cardinality>991363</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>991372</v>
+                    <v>991363</v>
                 </e>
                 <e>
                     <k>param_id</k>
-                    <v>991372</v>
+                    <v>991363</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -15521,7 +15529,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>991372</v>
+                                    <v>991363</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15537,7 +15545,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>991372</v>
+                                    <v>991363</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15583,11 +15591,11 @@
         </relation>
         <relation>
             <name>general_type_parameter_constraints</name>
-            <cardinality>283258</cardinality>
+            <cardinality>283256</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>282033</v>
+                    <v>282031</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -15605,7 +15613,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>280808</v>
+                                    <v>280806</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15656,11 +15664,11 @@
         </relation>
         <relation>
             <name>specific_type_parameter_constraints</name>
-            <cardinality>302127</cardinality>
+            <cardinality>302125</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>295217</v>
+                    <v>295214</v>
                 </e>
                 <e>
                     <k>base_id</k>
@@ -15678,7 +15686,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>290167</v>
+                                    <v>290165</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15699,7 +15707,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>24776</v>
+                                    <v>24775</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15739,7 +15747,7 @@
         </relation>
         <relation>
             <name>specific_type_parameter_nullability</name>
-            <cardinality>35626</cardinality>
+            <cardinality>35625</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -16126,11 +16134,11 @@
         </relation>
         <relation>
             <name>has_modifiers</name>
-            <cardinality>100736682</cardinality>
+            <cardinality>100735739</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>66663238</v>
+                    <v>66662615</v>
                 </e>
                 <e>
                     <k>mod_id</k>
@@ -16148,17 +16156,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>34234237</v>
+                                    <v>34233917</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>30788810</v>
+                                    <v>30788522</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>1640190</v>
+                                    <v>1640174</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16249,11 +16257,11 @@
         </relation>
         <relation>
             <name>compiler_generated</name>
-            <cardinality>1278339</cardinality>
+            <cardinality>1278327</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1278339</v>
+                    <v>1278327</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -16348,19 +16356,19 @@
         </relation>
         <relation>
             <name>nested_types</name>
-            <cardinality>2161819</cardinality>
+            <cardinality>2161798</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2161819</v>
+                    <v>2161798</v>
                 </e>
                 <e>
                     <k>declaring_type_id</k>
-                    <v>867580</v>
+                    <v>867572</v>
                 </e>
                 <e>
                     <k>unbound_id</k>
-                    <v>1812914</v>
+                    <v>1812897</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16374,7 +16382,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2161819</v>
+                                    <v>2161798</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16390,7 +16398,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2161819</v>
+                                    <v>2161798</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16406,12 +16414,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>507720</v>
+                                    <v>507715</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>151344</v>
+                                    <v>151343</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -16447,27 +16455,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>509816</v>
+                                    <v>509812</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>152023</v>
+                                    <v>152022</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>71848</v>
+                                    <v>71847</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>65587</v>
+                                    <v>65586</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>26</b>
-                                    <v>65085</v>
+                                    <v>65084</v>
                                 </b>
                                 <b>
                                     <a>26</a>
@@ -16488,12 +16496,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1746795</v>
+                                    <v>1746779</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>490</b>
-                                    <v>66119</v>
+                                    <v>66118</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16509,7 +16517,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1757397</v>
+                                    <v>1757380</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -16524,27 +16532,27 @@
         </relation>
         <relation>
             <name>properties</name>
-            <cardinality>6642412</cardinality>
+            <cardinality>6642350</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6642412</v>
+                    <v>6642350</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1540642</v>
+                    <v>1540628</v>
                 </e>
                 <e>
                     <k>declaring_type_id</k>
-                    <v>1854464</v>
+                    <v>1854447</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>737232</v>
+                    <v>737225</v>
                 </e>
                 <e>
                     <k>unbound_id</k>
-                    <v>5942802</v>
+                    <v>5942747</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16558,7 +16566,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6642412</v>
+                                    <v>6642350</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16574,7 +16582,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6642412</v>
+                                    <v>6642350</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16590,7 +16598,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6642412</v>
+                                    <v>6642350</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16606,7 +16614,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6642412</v>
+                                    <v>6642350</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16622,27 +16630,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>972266</v>
+                                    <v>972257</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>248204</v>
+                                    <v>248202</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>95265</v>
+                                    <v>95264</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>124087</v>
+                                    <v>124086</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>8341</b>
-                                    <v>100817</v>
+                                    <v>100816</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16658,27 +16666,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>972266</v>
+                                    <v>972257</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>248559</v>
+                                    <v>248556</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>95118</v>
+                                    <v>95117</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>124412</v>
+                                    <v>124411</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>4889</b>
-                                    <v>100286</v>
+                                    <v>100285</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16694,12 +16702,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1346951</v>
+                                    <v>1346938</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>111448</v>
+                                    <v>111447</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -16720,12 +16728,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>980741</v>
+                                    <v>980732</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>254051</v>
+                                    <v>254049</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -16735,12 +16743,12 @@
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>120130</v>
+                                    <v>120129</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>7118</b>
-                                    <v>90275</v>
+                                    <v>90274</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16756,37 +16764,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>660127</v>
+                                    <v>660121</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>435281</v>
+                                    <v>435277</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>247023</v>
+                                    <v>247021</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>156837</v>
+                                    <v>156835</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>156010</v>
+                                    <v>156008</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>14</b>
-                                    <v>142130</v>
+                                    <v>142129</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>2090</b>
-                                    <v>57053</v>
+                                    <v>57052</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16802,37 +16810,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>762392</v>
+                                    <v>762385</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>334641</v>
+                                    <v>334637</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>247407</v>
+                                    <v>247405</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>159435</v>
+                                    <v>159434</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>155951</v>
+                                    <v>155949</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>14</b>
-                                    <v>139916</v>
+                                    <v>139914</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>2090</b>
-                                    <v>54720</v>
+                                    <v>54719</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16848,27 +16856,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>764990</v>
+                                    <v>764983</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>530281</v>
+                                    <v>530276</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>228389</v>
+                                    <v>228387</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>122552</v>
+                                    <v>122550</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>9</b>
-                                    <v>154563</v>
+                                    <v>154561</v>
                                 </b>
                                 <b>
                                     <a>9</a>
@@ -16889,37 +16897,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>660127</v>
+                                    <v>660121</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>435281</v>
+                                    <v>435277</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>247023</v>
+                                    <v>247021</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>156837</v>
+                                    <v>156835</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>156010</v>
+                                    <v>156008</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>14</b>
-                                    <v>142130</v>
+                                    <v>142129</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>2090</b>
-                                    <v>57053</v>
+                                    <v>57052</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16935,17 +16943,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>402738</v>
+                                    <v>402734</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>152023</v>
+                                    <v>152022</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>49375</v>
+                                    <v>49374</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -16955,7 +16963,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>32</b>
-                                    <v>55340</v>
+                                    <v>55339</v>
                                 </b>
                                 <b>
                                     <a>32</a>
@@ -16976,12 +16984,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>589136</v>
+                                    <v>589130</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>82449</v>
+                                    <v>82448</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -17007,12 +17015,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>421756</v>
+                                    <v>421752</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>145733</v>
+                                    <v>145732</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -17027,7 +17035,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>51</b>
-                                    <v>55399</v>
+                                    <v>55398</v>
                                 </b>
                                 <b>
                                     <a>51</a>
@@ -17048,12 +17056,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>404923</v>
+                                    <v>404920</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>154268</v>
+                                    <v>154266</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -17063,12 +17071,12 @@
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>62575</v>
+                                    <v>62574</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>40</b>
-                                    <v>55399</v>
+                                    <v>55398</v>
                                 </b>
                                 <b>
                                     <a>40</a>
@@ -17089,12 +17097,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5841365</v>
+                                    <v>5841310</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1206</b>
-                                    <v>101437</v>
+                                    <v>101436</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17110,7 +17118,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5942802</v>
+                                    <v>5942747</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17126,12 +17134,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5841365</v>
+                                    <v>5841310</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1206</b>
-                                    <v>101437</v>
+                                    <v>101436</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17147,12 +17155,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5921038</v>
+                                    <v>5920983</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1206</b>
-                                    <v>21764</v>
+                                    <v>21763</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17162,15 +17170,15 @@
         </relation>
         <relation>
             <name>property_location</name>
-            <cardinality>6657089</cardinality>
+            <cardinality>6657027</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6642412</v>
+                    <v>6642350</v>
                 </e>
                 <e>
                     <k>loc</k>
-                    <v>10926</v>
+                    <v>10955</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -17184,7 +17192,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6631840</v>
+                                    <v>6631778</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -17205,7 +17213,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>5</b>
-                                    <v>885</v>
+                                    <v>915</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -17280,11 +17288,11 @@
         </relation>
         <relation>
             <name>indexers</name>
-            <cardinality>105719</cardinality>
+            <cardinality>105718</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>105719</v>
+                    <v>105718</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -17292,7 +17300,7 @@
                 </e>
                 <e>
                     <k>declaring_type_id</k>
-                    <v>92814</v>
+                    <v>92813</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -17314,7 +17322,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>105719</v>
+                                    <v>105718</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17330,7 +17338,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>105719</v>
+                                    <v>105718</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17346,7 +17354,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>105719</v>
+                                    <v>105718</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17362,7 +17370,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>105719</v>
+                                    <v>105718</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17563,7 +17571,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>92726</v>
+                                    <v>92725</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -17584,7 +17592,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>86731</v>
+                                    <v>86730</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -17688,7 +17696,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14027</v>
+                                    <v>14026</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -17818,7 +17826,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>35968</v>
+                                    <v>35967</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -17833,11 +17841,11 @@
         </relation>
         <relation>
             <name>indexer_location</name>
-            <cardinality>106044</cardinality>
+            <cardinality>106043</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>105719</v>
+                    <v>105718</v>
                 </e>
                 <e>
                     <k>loc</k>
@@ -17855,7 +17863,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>105394</v>
+                                    <v>105393</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -17926,11 +17934,11 @@
         </relation>
         <relation>
             <name>accessors</name>
-            <cardinality>7915360</cardinality>
+            <cardinality>7915286</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7915360</v>
+                    <v>7915286</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -17938,15 +17946,15 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>2102196</v>
+                    <v>2102177</v>
                 </e>
                 <e>
                     <k>declaring_member_id</k>
-                    <v>6746921</v>
+                    <v>6746858</v>
                 </e>
                 <e>
                     <k>unbound_id</k>
-                    <v>7039570</v>
+                    <v>7039504</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -17960,7 +17968,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7915360</v>
+                                    <v>7915286</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17976,7 +17984,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7915360</v>
+                                    <v>7915286</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17992,7 +18000,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7915360</v>
+                                    <v>7915286</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18008,7 +18016,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7915360</v>
+                                    <v>7915286</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18108,27 +18116,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1367179</v>
+                                    <v>1367166</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>330831</v>
+                                    <v>330828</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>191653</v>
+                                    <v>191651</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>17</b>
-                                    <v>160587</v>
+                                    <v>160586</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>3385</b>
-                                    <v>51944</v>
+                                    <v>51943</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18144,7 +18152,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2102196</v>
+                                    <v>2102177</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18160,27 +18168,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1367179</v>
+                                    <v>1367166</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>330831</v>
+                                    <v>330828</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>191653</v>
+                                    <v>191651</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>17</b>
-                                    <v>160587</v>
+                                    <v>160586</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>3385</b>
-                                    <v>51944</v>
+                                    <v>51943</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18196,22 +18204,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1382003</v>
+                                    <v>1381990</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>339690</v>
+                                    <v>339687</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>189616</v>
+                                    <v>189614</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>24</b>
-                                    <v>158786</v>
+                                    <v>158784</v>
                                 </b>
                                 <b>
                                     <a>24</a>
@@ -18232,12 +18240,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5578483</v>
+                                    <v>5578431</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1168438</v>
+                                    <v>1168427</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18253,12 +18261,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5578483</v>
+                                    <v>5578431</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1168438</v>
+                                    <v>1168427</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18274,12 +18282,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5578483</v>
+                                    <v>5578431</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1168438</v>
+                                    <v>1168427</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18295,12 +18303,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5578483</v>
+                                    <v>5578431</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1168438</v>
+                                    <v>1168427</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18316,12 +18324,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6919853</v>
+                                    <v>6919788</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1206</b>
-                                    <v>119717</v>
+                                    <v>119716</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18337,7 +18345,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7039570</v>
+                                    <v>7039504</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18353,7 +18361,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7039570</v>
+                                    <v>7039504</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18369,12 +18377,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6919853</v>
+                                    <v>6919788</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1206</b>
-                                    <v>119717</v>
+                                    <v>119716</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18395,15 +18403,15 @@
         </relation>
         <relation>
             <name>accessor_location</name>
-            <cardinality>7933078</cardinality>
+            <cardinality>7933004</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7915360</v>
+                    <v>7915286</v>
                 </e>
                 <e>
                     <k>loc</k>
-                    <v>10926</v>
+                    <v>10955</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18417,7 +18425,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7901923</v>
+                                    <v>7901849</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18438,67 +18446,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>6</b>
-                                    <v>885</v>
+                                    <v>944</v>
                                 </b>
                                 <b>
                                     <a>6</a>
-                                    <b>12</b>
+                                    <b>13</b>
+                                    <v>974</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>26</b>
+                                    <v>856</v>
+                                </b>
+                                <b>
+                                    <a>26</a>
+                                    <b>43</b>
                                     <v>826</v>
                                 </b>
                                 <b>
-                                    <a>12</a>
-                                    <b>22</b>
+                                    <a>44</a>
+                                    <b>68</b>
                                     <v>826</v>
                                 </b>
                                 <b>
-                                    <a>22</a>
-                                    <b>38</b>
-                                    <v>885</v>
-                                </b>
-                                <b>
-                                    <a>38</a>
-                                    <b>66</b>
-                                    <v>915</v>
-                                </b>
-                                <b>
-                                    <a>67</a>
-                                    <b>105</b>
+                                    <a>68</a>
+                                    <b>106</b>
                                     <v>826</v>
                                 </b>
                                 <b>
-                                    <a>105</a>
-                                    <b>161</b>
+                                    <a>116</a>
+                                    <b>167</b>
                                     <v>826</v>
                                 </b>
                                 <b>
-                                    <a>164</a>
-                                    <b>269</b>
+                                    <a>168</a>
+                                    <b>273</b>
+                                    <v>856</v>
+                                </b>
+                                <b>
+                                    <a>275</a>
+                                    <b>373</b>
                                     <v>826</v>
                                 </b>
                                 <b>
-                                    <a>269</a>
-                                    <b>361</b>
+                                    <a>373</a>
+                                    <b>492</b>
                                     <v>826</v>
                                 </b>
                                 <b>
-                                    <a>364</a>
-                                    <b>464</b>
+                                    <a>517</a>
+                                    <b>1154</b>
                                     <v>826</v>
                                 </b>
                                 <b>
-                                    <a>477</a>
-                                    <b>1105</b>
+                                    <a>1167</a>
+                                    <b>2661</b>
                                     <v>826</v>
                                 </b>
                                 <b>
-                                    <a>1105</a>
-                                    <b>2387</b>
-                                    <v>826</v>
-                                </b>
-                                <b>
-                                    <a>2455</a>
+                                    <a>2853</a>
                                     <b>13984</b>
-                                    <v>797</v>
+                                    <v>708</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18520,7 +18528,7 @@
                 </e>
                 <e>
                     <k>declaring_type_id</k>
-                    <v>33842</v>
+                    <v>33841</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -18528,7 +18536,7 @@
                 </e>
                 <e>
                     <k>unbound_id</k>
-                    <v>70637</v>
+                    <v>70636</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18791,7 +18799,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>3396</v>
+                                    <v>3395</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -18945,7 +18953,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>262</b>
-                                    <v>1447</v>
+                                    <v>1446</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19007,7 +19015,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>3396</v>
+                                    <v>3395</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -19033,7 +19041,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>68127</v>
+                                    <v>68126</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19054,7 +19062,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>70637</v>
+                                    <v>70636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19070,7 +19078,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>68127</v>
+                                    <v>68126</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19199,11 +19207,11 @@
         </relation>
         <relation>
             <name>event_accessors</name>
-            <cardinality>160823</cardinality>
+            <cardinality>160822</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>160823</v>
+                    <v>160822</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -19211,7 +19219,7 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>68688</v>
+                    <v>68687</v>
                 </e>
                 <e>
                     <k>declaring_event_id</k>
@@ -19219,7 +19227,7 @@
                 </e>
                 <e>
                     <k>unbound_id</k>
-                    <v>141274</v>
+                    <v>141273</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19233,7 +19241,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>160823</v>
+                                    <v>160822</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19249,7 +19257,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>160823</v>
+                                    <v>160822</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19265,7 +19273,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>160823</v>
+                                    <v>160822</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19281,7 +19289,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>160823</v>
+                                    <v>160822</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19397,7 +19405,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>68688</v>
+                                    <v>68687</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19549,7 +19557,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>136254</v>
+                                    <v>136253</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19570,7 +19578,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>141274</v>
+                                    <v>141273</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19586,7 +19594,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>141274</v>
+                                    <v>141273</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19602,7 +19610,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>136254</v>
+                                    <v>136253</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19617,11 +19625,11 @@
         </relation>
         <relation>
             <name>event_accessor_location</name>
-            <cardinality>160823</cardinality>
+            <cardinality>160822</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>160823</v>
+                    <v>160822</v>
                 </e>
                 <e>
                     <k>loc</k>
@@ -19639,7 +19647,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>160823</v>
+                                    <v>160822</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19710,11 +19718,11 @@
         </relation>
         <relation>
             <name>operators</name>
-            <cardinality>629721</cardinality>
+            <cardinality>629715</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>629721</v>
+                    <v>629715</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -19726,11 +19734,11 @@
                 </e>
                 <e>
                     <k>declaring_type_id</k>
-                    <v>75488</v>
+                    <v>75487</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>30578</v>
+                    <v>30577</v>
                 </e>
                 <e>
                     <k>unbound_id</k>
@@ -19748,7 +19756,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>629721</v>
+                                    <v>629715</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19764,7 +19772,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>629721</v>
+                                    <v>629715</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19780,7 +19788,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>629721</v>
+                                    <v>629715</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19796,7 +19804,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>629721</v>
+                                    <v>629715</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19812,7 +19820,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>629721</v>
+                                    <v>629715</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20443,7 +20451,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>16</b>
-                                    <v>5808</v>
+                                    <v>5807</v>
                                 </b>
                                 <b>
                                     <a>16</a>
@@ -20552,7 +20560,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>16</b>
-                                    <v>5808</v>
+                                    <v>5807</v>
                                 </b>
                                 <b>
                                     <a>16</a>
@@ -20813,7 +20821,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>66686</v>
+                                    <v>66685</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20871,7 +20879,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>66686</v>
+                                    <v>66685</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20917,15 +20925,15 @@
         </relation>
         <relation>
             <name>operator_location</name>
-            <cardinality>1210557</cardinality>
+            <cardinality>1210545</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>586251</v>
+                    <v>586245</v>
                 </e>
                 <e>
                     <k>loc</k>
-                    <v>10667</v>
+                    <v>10683</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20944,12 +20952,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>567174</v>
+                                    <v>567169</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>15248</v>
+                                    <v>15247</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20985,7 +20993,7 @@
                                 <b>
                                     <a>39</a>
                                     <b>50</b>
-                                    <v>916</v>
+                                    <v>899</v>
                                 </b>
                                 <b>
                                     <a>52</a>
@@ -21010,7 +21018,7 @@
                                 <b>
                                     <a>79</a>
                                     <b>83</b>
-                                    <v>850</v>
+                                    <v>867</v>
                                 </b>
                                 <b>
                                     <a>85</a>
@@ -21025,12 +21033,12 @@
                                 <b>
                                     <a>97</a>
                                     <b>279</b>
-                                    <v>801</v>
+                                    <v>834</v>
                                 </b>
                                 <b>
-                                    <a>345</a>
-                                    <b>17300</b>
-                                    <v>65</v>
+                                    <a>664</a>
+                                    <b>17251</b>
+                                    <v>49</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21040,15 +21048,15 @@
         </relation>
         <relation>
             <name>constant_value</name>
-            <cardinality>3875422</cardinality>
+            <cardinality>3875386</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3873680</v>
+                    <v>3873643</v>
                 </e>
                 <e>
                     <k>value</k>
-                    <v>1314319</v>
+                    <v>1314307</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21062,7 +21070,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3872528</v>
+                                    <v>3872492</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21083,17 +21091,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1062512</v>
+                                    <v>1062502</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>130820</v>
+                                    <v>130819</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>10</b>
-                                    <v>101821</v>
+                                    <v>101820</v>
                                 </b>
                                 <b>
                                     <a>10</a>
@@ -21108,27 +21116,27 @@
         </relation>
         <relation>
             <name>methods</name>
-            <cardinality>20454980</cardinality>
+            <cardinality>20454789</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>20454980</v>
+                    <v>20454789</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>5761337</v>
+                    <v>5761283</v>
                 </e>
                 <e>
                     <k>declaring_type_id</k>
-                    <v>4275208</v>
+                    <v>4275168</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1360564</v>
+                    <v>1360551</v>
                 </e>
                 <e>
                     <k>unbound_id</k>
-                    <v>16901323</v>
+                    <v>16901165</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21142,7 +21150,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20454980</v>
+                                    <v>20454789</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21158,7 +21166,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20454980</v>
+                                    <v>20454789</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21174,7 +21182,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20454980</v>
+                                    <v>20454789</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21190,7 +21198,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20454980</v>
+                                    <v>20454789</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21206,22 +21214,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4128352</v>
+                                    <v>4128313</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>674804</v>
+                                    <v>674798</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>458551</v>
+                                    <v>458547</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>26</b>
-                                    <v>434749</v>
+                                    <v>434745</v>
                                 </b>
                                 <b>
                                     <a>26</a>
@@ -21242,22 +21250,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4308282</v>
+                                    <v>4308242</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>587629</v>
+                                    <v>587624</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>515220</v>
+                                    <v>515216</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10142</b>
-                                    <v>350203</v>
+                                    <v>350200</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21273,17 +21281,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5249541</v>
+                                    <v>5249492</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>440360</v>
+                                    <v>440356</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>2905</b>
-                                    <v>71434</v>
+                                    <v>71433</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21299,22 +21307,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4191695</v>
+                                    <v>4191656</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>694589</v>
+                                    <v>694583</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>457960</v>
+                                    <v>457956</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8458</b>
-                                    <v>417090</v>
+                                    <v>417086</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21330,42 +21338,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1491562</v>
+                                    <v>1491548</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>954902</v>
+                                    <v>954893</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>425388</v>
+                                    <v>425384</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>301773</v>
+                                    <v>301770</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>243096</v>
+                                    <v>243093</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>373828</v>
+                                    <v>373824</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>18</b>
-                                    <v>328971</v>
+                                    <v>328968</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>8066</b>
-                                    <v>155685</v>
+                                    <v>155684</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21381,37 +21389,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1548261</v>
+                                    <v>1548246</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>987947</v>
+                                    <v>987937</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>436728</v>
+                                    <v>436724</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>342466</v>
+                                    <v>342463</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>264771</v>
+                                    <v>264769</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>361484</v>
+                                    <v>361481</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>70</b>
-                                    <v>320850</v>
+                                    <v>320847</v>
                                 </b>
                                 <b>
                                     <a>70</a>
@@ -21432,32 +21440,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2042987</v>
+                                    <v>2042968</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1046683</v>
+                                    <v>1046673</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>428371</v>
+                                    <v>428367</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>350735</v>
+                                    <v>350731</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>10</b>
-                                    <v>321559</v>
+                                    <v>321556</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>848</b>
-                                    <v>84871</v>
+                                    <v>84870</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21473,42 +21481,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1491592</v>
+                                    <v>1491578</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>954872</v>
+                                    <v>954863</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>425388</v>
+                                    <v>425384</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>301773</v>
+                                    <v>301770</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>243096</v>
+                                    <v>243093</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>373828</v>
+                                    <v>373824</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>18</b>
-                                    <v>328971</v>
+                                    <v>328968</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>8066</b>
-                                    <v>155685</v>
+                                    <v>155684</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21524,32 +21532,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>771576</v>
+                                    <v>771569</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>224580</v>
+                                    <v>224578</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>98868</v>
+                                    <v>98867</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>120691</v>
+                                    <v>120690</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>23</b>
-                                    <v>102766</v>
+                                    <v>102765</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>192615</b>
-                                    <v>42081</v>
+                                    <v>42080</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21565,22 +21573,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>948848</v>
+                                    <v>948839</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>179546</v>
+                                    <v>179544</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>116380</v>
+                                    <v>116379</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>27</b>
-                                    <v>102235</v>
+                                    <v>102234</v>
                                 </b>
                                 <b>
                                     <a>27</a>
@@ -21601,22 +21609,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>883290</v>
+                                    <v>883282</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>215160</v>
+                                    <v>215158</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>88798</v>
+                                    <v>88797</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>108554</v>
+                                    <v>108553</v>
                                 </b>
                                 <b>
                                     <a>9</a>
@@ -21637,22 +21645,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>774322</v>
+                                    <v>774315</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>226381</v>
+                                    <v>226379</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>99163</v>
+                                    <v>99162</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>121607</v>
+                                    <v>121605</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -21662,7 +21670,7 @@
                                 <b>
                                     <a>24</a>
                                     <b>167300</b>
-                                    <v>36913</v>
+                                    <v>36912</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21678,12 +21686,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16368679</v>
+                                    <v>16368526</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3017</b>
-                                    <v>532643</v>
+                                    <v>532638</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21699,7 +21707,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16901323</v>
+                                    <v>16901165</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21715,12 +21723,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16368797</v>
+                                    <v>16368644</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3017</b>
-                                    <v>532525</v>
+                                    <v>532520</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21736,12 +21744,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16731877</v>
+                                    <v>16731720</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1636</b>
-                                    <v>169446</v>
+                                    <v>169445</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21751,11 +21759,11 @@
         </relation>
         <relation>
             <name>method_location</name>
-            <cardinality>20553553</cardinality>
+            <cardinality>20553361</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>20454980</v>
+                    <v>20454789</v>
                 </e>
                 <e>
                     <k>loc</k>
@@ -21773,7 +21781,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20387030</v>
+                                    <v>20386839</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21864,23 +21872,23 @@
         </relation>
         <relation>
             <name>constructors</name>
-            <cardinality>5991233</cardinality>
+            <cardinality>5991176</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5991233</v>
+                    <v>5991176</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>2792770</v>
+                    <v>2792744</v>
                 </e>
                 <e>
                     <k>declaring_type_id</k>
-                    <v>4484787</v>
+                    <v>4484745</v>
                 </e>
                 <e>
                     <k>unbound_id</k>
-                    <v>5562625</v>
+                    <v>5562573</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21894,7 +21902,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5991233</v>
+                                    <v>5991176</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21910,7 +21918,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5991233</v>
+                                    <v>5991176</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21926,7 +21934,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5991233</v>
+                                    <v>5991176</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21942,17 +21950,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2023704</v>
+                                    <v>2023685</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>507720</v>
+                                    <v>507715</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>213388</v>
+                                    <v>213386</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -21973,17 +21981,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2556289</v>
+                                    <v>2556265</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>210435</v>
+                                    <v>210433</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>11806</b>
-                                    <v>26046</v>
+                                    <v>26045</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21999,17 +22007,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2053914</v>
+                                    <v>2053895</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>509344</v>
+                                    <v>509339</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>10</b>
-                                    <v>211291</v>
+                                    <v>211289</v>
                                 </b>
                                 <b>
                                     <a>10</a>
@@ -22030,17 +22038,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3341745</v>
+                                    <v>3341713</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>968752</v>
+                                    <v>968743</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>55</b>
-                                    <v>174289</v>
+                                    <v>174288</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22056,7 +22064,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4484787</v>
+                                    <v>4484745</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22072,17 +22080,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3341745</v>
+                                    <v>3341713</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>968752</v>
+                                    <v>968743</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>55</b>
-                                    <v>174289</v>
+                                    <v>174288</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22098,7 +22106,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5506044</v>
+                                    <v>5505993</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22119,7 +22127,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5562625</v>
+                                    <v>5562573</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22135,7 +22143,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5506044</v>
+                                    <v>5505993</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22150,11 +22158,11 @@
         </relation>
         <relation>
             <name>constructor_location</name>
-            <cardinality>6040667</cardinality>
+            <cardinality>6040610</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5991233</v>
+                    <v>5991176</v>
                 </e>
                 <e>
                     <k>loc</k>
@@ -22172,7 +22180,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5971329</v>
+                                    <v>5971273</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22526,7 +22534,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6290</v>
+                                    <v>6289</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22582,15 +22590,15 @@
         </relation>
         <relation>
             <name>overrides</name>
-            <cardinality>4832155</cardinality>
+            <cardinality>4832110</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4832155</v>
+                    <v>4832110</v>
                 </e>
                 <e>
                     <k>base_id</k>
-                    <v>1569700</v>
+                    <v>1569685</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22604,7 +22612,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4832155</v>
+                                    <v>4832110</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22620,22 +22628,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1071371</v>
+                                    <v>1071361</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>247171</v>
+                                    <v>247169</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>127336</v>
+                                    <v>127334</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>44</b>
-                                    <v>117738</v>
+                                    <v>117737</v>
                                 </b>
                                 <b>
                                     <a>44</a>
@@ -22650,15 +22658,15 @@
         </relation>
         <relation>
             <name>explicitly_implements</name>
-            <cardinality>1824372</cardinality>
+            <cardinality>1824355</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1823811</v>
+                    <v>1823794</v>
                 </e>
                 <e>
                     <k>interface_id</k>
-                    <v>134836</v>
+                    <v>134835</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22672,7 +22680,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1823250</v>
+                                    <v>1823233</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22693,7 +22701,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>69072</v>
+                                    <v>69071</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22713,12 +22721,12 @@
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>10188</v>
+                                    <v>10187</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>35</b>
-                                    <v>10188</v>
+                                    <v>10187</v>
                                 </b>
                                 <b>
                                     <a>35</a>
@@ -23077,11 +23085,11 @@
         </relation>
         <relation>
             <name>fields</name>
-            <cardinality>14976517</cardinality>
+            <cardinality>14976377</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>14976517</v>
+                    <v>14976377</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -23089,19 +23097,19 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>6219416</v>
+                    <v>6219358</v>
                 </e>
                 <e>
                     <k>declaring_type_id</k>
-                    <v>3386631</v>
+                    <v>3386599</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>2968123</v>
+                    <v>2968095</v>
                 </e>
                 <e>
                     <k>unbound_id</k>
-                    <v>14485511</v>
+                    <v>14485376</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23115,7 +23123,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14976517</v>
+                                    <v>14976377</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23131,7 +23139,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14976517</v>
+                                    <v>14976377</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23147,7 +23155,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14976517</v>
+                                    <v>14976377</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23163,7 +23171,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14976517</v>
+                                    <v>14976377</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23179,7 +23187,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14976517</v>
+                                    <v>14976377</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23300,22 +23308,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4898363</v>
+                                    <v>4898317</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>694826</v>
+                                    <v>694819</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>467558</v>
+                                    <v>467554</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>12308</b>
-                                    <v>158668</v>
+                                    <v>158666</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23331,12 +23339,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6076724</v>
+                                    <v>6076667</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>142691</v>
+                                    <v>142690</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23352,22 +23360,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4898363</v>
+                                    <v>4898317</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>694855</v>
+                                    <v>694849</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>467528</v>
+                                    <v>467524</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>12308</b>
-                                    <v>158668</v>
+                                    <v>158666</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23383,17 +23391,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5453627</v>
+                                    <v>5453576</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>467587</v>
+                                    <v>467583</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>12308</b>
-                                    <v>298200</v>
+                                    <v>298197</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23409,22 +23417,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4931319</v>
+                                    <v>4931273</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>696538</v>
+                                    <v>696532</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>10</b>
-                                    <v>479636</v>
+                                    <v>479631</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>12308</b>
-                                    <v>111921</v>
+                                    <v>111920</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23440,42 +23448,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>934142</v>
+                                    <v>934133</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>866074</v>
+                                    <v>866066</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>480847</v>
+                                    <v>480842</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>296428</v>
+                                    <v>296425</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>198859</v>
+                                    <v>198857</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>247466</v>
+                                    <v>247464</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>15</b>
-                                    <v>263619</v>
+                                    <v>263617</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>6823</b>
-                                    <v>99193</v>
+                                    <v>99192</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23491,12 +23499,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3183076</v>
+                                    <v>3183047</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>203554</v>
+                                    <v>203552</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23512,42 +23520,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>934142</v>
+                                    <v>934133</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>866103</v>
+                                    <v>866095</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>480817</v>
+                                    <v>480813</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>296428</v>
+                                    <v>296425</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>198859</v>
+                                    <v>198857</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>247466</v>
+                                    <v>247464</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>15</b>
-                                    <v>263619</v>
+                                    <v>263617</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>6823</b>
-                                    <v>99193</v>
+                                    <v>99192</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23563,32 +23571,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1290399</v>
+                                    <v>1290387</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>940550</v>
+                                    <v>940541</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>442309</v>
+                                    <v>442305</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>234473</v>
+                                    <v>234470</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>310957</v>
+                                    <v>310954</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>524</b>
-                                    <v>167940</v>
+                                    <v>167939</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23604,42 +23612,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>934142</v>
+                                    <v>934133</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>866074</v>
+                                    <v>866066</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>480847</v>
+                                    <v>480842</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>296428</v>
+                                    <v>296425</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>198859</v>
+                                    <v>198857</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>247466</v>
+                                    <v>247464</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>15</b>
-                                    <v>263619</v>
+                                    <v>263617</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>6823</b>
-                                    <v>99193</v>
+                                    <v>99192</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23655,22 +23663,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2017945</v>
+                                    <v>2017927</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>365766</v>
+                                    <v>365762</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>273335</v>
+                                    <v>273332</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>14</b>
-                                    <v>225436</v>
+                                    <v>225434</v>
                                 </b>
                                 <b>
                                     <a>14</a>
@@ -23691,12 +23699,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2881953</v>
+                                    <v>2881926</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>86170</v>
+                                    <v>86169</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23712,22 +23720,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2161080</v>
+                                    <v>2161060</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>352477</v>
+                                    <v>352474</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>233675</v>
+                                    <v>233673</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>33041</b>
-                                    <v>220889</v>
+                                    <v>220887</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23743,22 +23751,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2240193</v>
+                                    <v>2240172</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>357172</v>
+                                    <v>357169</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>229600</v>
+                                    <v>229598</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>19141</b>
-                                    <v>141156</v>
+                                    <v>141155</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23774,27 +23782,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2022907</v>
+                                    <v>2022888</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>368453</v>
+                                    <v>368450</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>271356</v>
+                                    <v>271354</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>15</b>
-                                    <v>228626</v>
+                                    <v>228623</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>56593</b>
-                                    <v>76779</v>
+                                    <v>76778</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23810,12 +23818,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14401378</v>
+                                    <v>14401244</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1016</b>
-                                    <v>84132</v>
+                                    <v>84131</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23831,7 +23839,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14485511</v>
+                                    <v>14485376</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23847,7 +23855,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14485511</v>
+                                    <v>14485376</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23863,12 +23871,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14401378</v>
+                                    <v>14401244</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1016</b>
-                                    <v>84132</v>
+                                    <v>84131</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23884,7 +23892,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14459317</v>
+                                    <v>14459182</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23899,11 +23907,11 @@
         </relation>
         <relation>
             <name>field_location</name>
-            <cardinality>14965266</cardinality>
+            <cardinality>14965126</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>14877383</v>
+                    <v>14877243</v>
                 </e>
                 <e>
                     <k>loc</k>
@@ -23921,12 +23929,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14824434</v>
+                                    <v>14824296</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>22</b>
-                                    <v>52948</v>
+                                    <v>52947</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24017,11 +24025,11 @@
         </relation>
         <relation>
             <name>localvars</name>
-            <cardinality>499216</cardinality>
+            <cardinality>499212</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>499216</v>
+                    <v>499212</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -24029,7 +24037,7 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>91306</v>
+                    <v>91305</v>
                 </e>
                 <e>
                     <k>implicitly_typed</k>
@@ -24041,7 +24049,7 @@
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>499216</v>
+                    <v>499212</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24055,7 +24063,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>499216</v>
+                                    <v>499212</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24071,7 +24079,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>499216</v>
+                                    <v>499212</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24087,7 +24095,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>499216</v>
+                                    <v>499212</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24103,7 +24111,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>499216</v>
+                                    <v>499212</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24119,7 +24127,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>499216</v>
+                                    <v>499212</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24240,7 +24248,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>57798</v>
+                                    <v>57797</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24276,7 +24284,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>91122</v>
+                                    <v>91121</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24318,7 +24326,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>78906</v>
+                                    <v>78905</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24344,7 +24352,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>57798</v>
+                                    <v>57797</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24593,7 +24601,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18824</v>
+                                    <v>18823</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24660,7 +24668,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>499216</v>
+                                    <v>499212</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24676,7 +24684,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>499216</v>
+                                    <v>499212</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24692,7 +24700,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>499216</v>
+                                    <v>499212</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24708,7 +24716,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>499216</v>
+                                    <v>499212</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24724,7 +24732,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>499216</v>
+                                    <v>499212</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24734,15 +24742,15 @@
         </relation>
         <relation>
             <name>localvar_location</name>
-            <cardinality>499216</cardinality>
+            <cardinality>499212</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>499216</v>
+                    <v>499212</v>
                 </e>
                 <e>
                     <k>loc</k>
-                    <v>499216</v>
+                    <v>499212</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24756,7 +24764,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>499216</v>
+                                    <v>499212</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24772,7 +24780,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>499216</v>
+                                    <v>499212</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24782,19 +24790,19 @@
         </relation>
         <relation>
             <name>params</name>
-            <cardinality>37386455</cardinality>
+            <cardinality>37386105</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>37386455</v>
+                    <v>37386105</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>2196576</v>
+                    <v>2196556</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>2827941</v>
+                    <v>2827915</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -24806,11 +24814,11 @@
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>20722350</v>
+                    <v>20722157</v>
                 </e>
                 <e>
                     <k>unbound_id</k>
-                    <v>30114153</v>
+                    <v>30113872</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24824,7 +24832,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37386455</v>
+                                    <v>37386105</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24840,7 +24848,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37386455</v>
+                                    <v>37386105</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24856,7 +24864,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37386455</v>
+                                    <v>37386105</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24872,7 +24880,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37386455</v>
+                                    <v>37386105</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24888,7 +24896,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37386455</v>
+                                    <v>37386105</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24904,7 +24912,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37386455</v>
+                                    <v>37386105</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24920,37 +24928,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>981598</v>
+                                    <v>981588</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>381535</v>
+                                    <v>381532</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>185481</v>
+                                    <v>185480</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>196585</v>
+                                    <v>196583</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>173876</v>
+                                    <v>173874</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>25</b>
-                                    <v>165666</v>
+                                    <v>165665</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>74292</b>
-                                    <v>111832</v>
+                                    <v>111831</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24966,22 +24974,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1784417</v>
+                                    <v>1784401</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>214156</v>
+                                    <v>214154</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>13</b>
-                                    <v>166995</v>
+                                    <v>166994</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>13366</b>
-                                    <v>31007</v>
+                                    <v>31006</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24997,22 +25005,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1518996</v>
+                                    <v>1518982</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>374596</v>
+                                    <v>374592</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>146294</v>
+                                    <v>146293</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>21</b>
-                                    <v>156689</v>
+                                    <v>156688</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25028,12 +25036,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2031234</v>
+                                    <v>2031215</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>164928</v>
+                                    <v>164927</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -25054,37 +25062,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>981598</v>
+                                    <v>981588</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>381535</v>
+                                    <v>381532</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>185481</v>
+                                    <v>185480</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>196585</v>
+                                    <v>196583</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>173876</v>
+                                    <v>173874</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>25</b>
-                                    <v>165666</v>
+                                    <v>165665</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>74292</b>
-                                    <v>111832</v>
+                                    <v>111831</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25100,37 +25108,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1002151</v>
+                                    <v>1002142</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>388504</v>
+                                    <v>388501</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>199951</v>
+                                    <v>199950</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>201103</v>
+                                    <v>201101</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>166050</v>
+                                    <v>166049</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>35</b>
-                                    <v>166670</v>
+                                    <v>166669</v>
                                 </b>
                                 <b>
                                     <a>35</a>
                                     <b>63585</b>
-                                    <v>72143</v>
+                                    <v>72142</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25146,37 +25154,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1386197</v>
+                                    <v>1386184</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>410623</v>
+                                    <v>410619</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>235861</v>
+                                    <v>235858</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>175736</v>
+                                    <v>175735</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>215278</v>
+                                    <v>215276</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>19</b>
-                                    <v>219383</v>
+                                    <v>219380</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>90397</b>
-                                    <v>184861</v>
+                                    <v>184860</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25192,22 +25200,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1901536</v>
+                                    <v>1901518</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>477539</v>
+                                    <v>477535</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>203436</v>
+                                    <v>203434</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>13</b>
-                                    <v>212650</v>
+                                    <v>212648</v>
                                 </b>
                                 <b>
                                     <a>13</a>
@@ -25228,22 +25236,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2062921</v>
+                                    <v>2062901</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>482589</v>
+                                    <v>482585</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>239670</v>
+                                    <v>239668</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>54</b>
-                                    <v>42760</v>
+                                    <v>42759</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25259,12 +25267,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2663278</v>
+                                    <v>2663253</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>164662</v>
+                                    <v>164661</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25280,37 +25288,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1428366</v>
+                                    <v>1428353</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>383720</v>
+                                    <v>383717</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>237012</v>
+                                    <v>237010</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>173403</v>
+                                    <v>173402</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>9</b>
-                                    <v>247850</v>
+                                    <v>247848</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>24</b>
-                                    <v>214362</v>
+                                    <v>214360</v>
                                 </b>
                                 <b>
                                     <a>24</a>
                                     <b>74138</b>
-                                    <v>143223</v>
+                                    <v>143222</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25326,37 +25334,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1394672</v>
+                                    <v>1394659</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>412158</v>
+                                    <v>412155</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>252280</v>
+                                    <v>252277</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>174703</v>
+                                    <v>174701</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>225377</v>
+                                    <v>225375</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>19</b>
-                                    <v>214185</v>
+                                    <v>214183</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>84336</b>
-                                    <v>154563</v>
+                                    <v>154561</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25964,27 +25972,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11717399</v>
+                                    <v>11717289</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5233890</v>
+                                    <v>5233841</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2032032</v>
+                                    <v>2032013</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>1570586</v>
+                                    <v>1570571</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>56</b>
-                                    <v>168442</v>
+                                    <v>168441</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26000,27 +26008,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11717369</v>
+                                    <v>11717259</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5233890</v>
+                                    <v>5233841</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2032032</v>
+                                    <v>2032013</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>1570616</v>
+                                    <v>1570601</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>56</b>
-                                    <v>168442</v>
+                                    <v>168441</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26036,22 +26044,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12389722</v>
+                                    <v>12389607</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5150023</v>
+                                    <v>5149975</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1884349</v>
+                                    <v>1884331</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>43</b>
-                                    <v>1298255</v>
+                                    <v>1298242</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26067,27 +26075,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11717399</v>
+                                    <v>11717289</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5233890</v>
+                                    <v>5233841</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2032032</v>
+                                    <v>2032013</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>1570586</v>
+                                    <v>1570571</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>56</b>
-                                    <v>168442</v>
+                                    <v>168441</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26103,12 +26111,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19796358</v>
+                                    <v>19796173</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>925991</v>
+                                    <v>925983</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26124,27 +26132,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11717399</v>
+                                    <v>11717289</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5233890</v>
+                                    <v>5233841</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2032032</v>
+                                    <v>2032013</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>1570586</v>
+                                    <v>1570571</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>56</b>
-                                    <v>168442</v>
+                                    <v>168441</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26160,12 +26168,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29105919</v>
+                                    <v>29105646</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>17584</b>
-                                    <v>1008234</v>
+                                    <v>1008225</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26181,7 +26189,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30114065</v>
+                                    <v>30113783</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26202,12 +26210,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29808925</v>
+                                    <v>29808646</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>9835</b>
-                                    <v>305228</v>
+                                    <v>305225</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26223,7 +26231,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30114153</v>
+                                    <v>30113872</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26239,7 +26247,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30114153</v>
+                                    <v>30113872</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26255,12 +26263,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29105919</v>
+                                    <v>29105646</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>17584</b>
-                                    <v>1008234</v>
+                                    <v>1008225</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26270,11 +26278,11 @@
         </relation>
         <relation>
             <name>param_location</name>
-            <cardinality>37558973</cardinality>
+            <cardinality>37558621</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>37386071</v>
+                    <v>37385721</v>
                 </e>
                 <e>
                     <k>loc</k>
@@ -26292,12 +26300,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37269041</v>
+                                    <v>37268692</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>70</b>
-                                    <v>117029</v>
+                                    <v>117028</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26383,11 +26391,11 @@
         </relation>
         <relation>
             <name>statements</name>
-            <cardinality>2457863</cardinality>
+            <cardinality>2457840</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2457863</v>
+                    <v>2457840</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -26405,7 +26413,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2457863</v>
+                                    <v>2457840</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26501,11 +26509,11 @@
         </relation>
         <relation>
             <name>stmt_parent</name>
-            <cardinality>2097112</cardinality>
+            <cardinality>2097092</cardinality>
             <columnsizes>
                 <e>
                     <k>stmt</k>
-                    <v>2097112</v>
+                    <v>2097092</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -26513,7 +26521,7 @@
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>1004054</v>
+                    <v>1004045</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26527,7 +26535,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2097112</v>
+                                    <v>2097092</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26543,7 +26551,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2097112</v>
+                                    <v>2097092</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26671,27 +26679,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>647155</v>
+                                    <v>647149</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>190657</v>
+                                    <v>190656</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>62747</v>
+                                    <v>62746</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>80168</v>
+                                    <v>80167</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>3407</b>
-                                    <v>23326</v>
+                                    <v>23325</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26707,27 +26715,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>647155</v>
+                                    <v>647149</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>190657</v>
+                                    <v>190656</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>62747</v>
+                                    <v>62746</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>80168</v>
+                                    <v>80167</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>3407</b>
-                                    <v>23326</v>
+                                    <v>23325</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26737,11 +26745,11 @@
         </relation>
         <relation>
             <name>stmt_parent_top_level</name>
-            <cardinality>360750</cardinality>
+            <cardinality>360747</cardinality>
             <columnsizes>
                 <e>
                     <k>stmt</k>
-                    <v>360750</v>
+                    <v>360747</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -26749,7 +26757,7 @@
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>340705</v>
+                    <v>340702</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26763,7 +26771,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>360750</v>
+                                    <v>360747</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26779,7 +26787,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>360750</v>
+                                    <v>360747</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26827,12 +26835,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>322204</v>
+                                    <v>322201</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>18501</v>
+                                    <v>18500</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26848,7 +26856,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>340705</v>
+                                    <v>340702</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26858,15 +26866,15 @@
         </relation>
         <relation>
             <name>stmt_location</name>
-            <cardinality>2457857</cardinality>
+            <cardinality>2457834</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2457857</v>
+                    <v>2457834</v>
                 </e>
                 <e>
                     <k>loc</k>
-                    <v>2376792</v>
+                    <v>2376770</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26880,7 +26888,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2457857</v>
+                                    <v>2457834</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26896,7 +26904,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2300098</v>
+                                    <v>2300076</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27130,7 +27138,7 @@
         </relation>
         <relation>
             <name>foreach_stmt_desugar</name>
-            <cardinality>133866</cardinality>
+            <cardinality>133865</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -27311,11 +27319,11 @@
         </relation>
         <relation>
             <name>expressions</name>
-            <cardinality>9729220</cardinality>
+            <cardinality>9729129</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9729220</v>
+                    <v>9729129</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -27337,7 +27345,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9729220</v>
+                                    <v>9729129</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27353,7 +27361,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9729220</v>
+                                    <v>9729129</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27562,7 +27570,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33100</v>
+                                    <v>33099</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27602,19 +27610,19 @@
         </relation>
         <relation>
             <name>expr_parent</name>
-            <cardinality>9420716</cardinality>
+            <cardinality>9420628</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>9420716</v>
+                    <v>9420628</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>32816</v>
+                    <v>32815</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>6308266</v>
+                    <v>6308207</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27628,7 +27636,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9420716</v>
+                                    <v>9420628</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27644,7 +27652,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9420716</v>
+                                    <v>9420628</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27665,7 +27673,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>17079</v>
+                                    <v>17078</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -27711,7 +27719,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>17079</v>
+                                    <v>17078</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -27752,17 +27760,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4096813</v>
+                                    <v>4096774</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1896471</v>
+                                    <v>1896453</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>22534</b>
-                                    <v>314982</v>
+                                    <v>314979</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27778,17 +27786,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4096813</v>
+                                    <v>4096774</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1896471</v>
+                                    <v>1896453</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>22534</b>
-                                    <v>314982</v>
+                                    <v>314979</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27798,11 +27806,11 @@
         </relation>
         <relation>
             <name>expr_parent_top_level</name>
-            <cardinality>5483306</cardinality>
+            <cardinality>5483254</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>5483306</v>
+                    <v>5483254</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -27810,7 +27818,7 @@
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>3999864</v>
+                    <v>3999827</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27824,7 +27832,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5483306</v>
+                                    <v>5483254</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27840,7 +27848,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5483306</v>
+                                    <v>5483254</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27998,17 +28006,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3335573</v>
+                                    <v>3335541</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>383809</v>
+                                    <v>383805</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>14</b>
-                                    <v>280481</v>
+                                    <v>280479</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28024,17 +28032,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3339559</v>
+                                    <v>3339528</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>380649</v>
+                                    <v>380646</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>12</b>
-                                    <v>279655</v>
+                                    <v>279652</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28141,26 +28149,26 @@
         </relation>
         <relation>
             <name>expr_compiler_generated</name>
-            <cardinality>9719652</cardinality>
+            <cardinality>9719561</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9719652</v>
+                    <v>9719561</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>expr_value</name>
-            <cardinality>6749402</cardinality>
+            <cardinality>6749339</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6749402</v>
+                    <v>6749339</v>
                 </e>
                 <e>
                     <k>value</k>
-                    <v>838197</v>
+                    <v>838189</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28174,7 +28182,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6749402</v>
+                                    <v>6749339</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28190,17 +28198,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>578711</v>
+                                    <v>578706</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>137760</v>
+                                    <v>137759</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>66857</v>
+                                    <v>66856</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -28215,15 +28223,15 @@
         </relation>
         <relation>
             <name>expr_call</name>
-            <cardinality>1585560</cardinality>
+            <cardinality>1585545</cardinality>
             <columnsizes>
                 <e>
                     <k>caller_id</k>
-                    <v>1585560</v>
+                    <v>1585545</v>
                 </e>
                 <e>
                     <k>target_id</k>
-                    <v>207402</v>
+                    <v>207400</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28237,7 +28245,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1585560</v>
+                                    <v>1585545</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28253,17 +28261,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>110904</v>
+                                    <v>110903</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>41217</v>
+                                    <v>41218</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>15565</v>
+                                    <v>15563</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -28288,15 +28296,15 @@
         </relation>
         <relation>
             <name>expr_access</name>
-            <cardinality>3615705</cardinality>
+            <cardinality>3615672</cardinality>
             <columnsizes>
                 <e>
                     <k>accesser_id</k>
-                    <v>3615705</v>
+                    <v>3615672</v>
                 </e>
                 <e>
                     <k>target_id</k>
-                    <v>874845</v>
+                    <v>874837</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28310,7 +28318,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3615705</v>
+                                    <v>3615672</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28326,32 +28334,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>292104</v>
+                                    <v>292101</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>190758</v>
+                                    <v>190756</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>134524</v>
+                                    <v>134523</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>82548</v>
+                                    <v>82547</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>80286</v>
+                                    <v>80285</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>15</b>
-                                    <v>68016</v>
+                                    <v>68015</v>
                                 </b>
                                 <b>
                                     <a>15</a>
@@ -28366,15 +28374,15 @@
         </relation>
         <relation>
             <name>expr_location</name>
-            <cardinality>9729220</cardinality>
+            <cardinality>9729129</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9729220</v>
+                    <v>9729129</v>
                 </e>
                 <e>
                     <k>loc</k>
-                    <v>7546334</v>
+                    <v>7546264</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28388,7 +28396,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9729220</v>
+                                    <v>9729129</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28404,17 +28412,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6528710</v>
+                                    <v>6528648</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>981628</v>
+                                    <v>981619</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9211</b>
-                                    <v>35996</v>
+                                    <v>35995</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28576,11 +28584,11 @@
         </relation>
         <relation>
             <name>expr_argument_name</name>
-            <cardinality>731798</cardinality>
+            <cardinality>731791</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>731798</v>
+                    <v>731791</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -28598,7 +28606,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>731798</v>
+                                    <v>731791</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29248,11 +29256,11 @@
         </relation>
         <relation>
             <name>xmlElements</name>
-            <cardinality>60596893</cardinality>
+            <cardinality>60596686</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>60596893</v>
+                    <v>60596686</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -29260,7 +29268,7 @@
                 </e>
                 <e>
                     <k>parentid</k>
-                    <v>24508816</v>
+                    <v>24508733</v>
                 </e>
                 <e>
                     <k>idx</k>
@@ -29282,7 +29290,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>60596893</v>
+                                    <v>60596686</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29298,7 +29306,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>60596893</v>
+                                    <v>60596686</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29314,7 +29322,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>60596893</v>
+                                    <v>60596686</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29330,7 +29338,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>60596893</v>
+                                    <v>60596686</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29520,27 +29528,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14236583</v>
+                                    <v>14236534</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4770003</v>
+                                    <v>4769987</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2178795</v>
+                                    <v>2178787</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>2111342</v>
+                                    <v>2111335</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>17196</b>
-                                    <v>1212092</v>
+                                    <v>1212088</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29556,22 +29564,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16928804</v>
+                                    <v>16928747</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4145902</v>
+                                    <v>4145888</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2094945</v>
+                                    <v>2094938</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>125</b>
-                                    <v>1339163</v>
+                                    <v>1339158</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29587,27 +29595,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14236583</v>
+                                    <v>14236534</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4770003</v>
+                                    <v>4769987</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2178795</v>
+                                    <v>2178787</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>2111342</v>
+                                    <v>2111335</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>17196</b>
-                                    <v>1212092</v>
+                                    <v>1212088</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29623,7 +29631,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>24508816</v>
+                                    <v>24508733</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30211,15 +30219,15 @@
         </relation>
         <relation>
             <name>xmlAttrs</name>
-            <cardinality>41517960</cardinality>
+            <cardinality>41517819</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>41517960</v>
+                    <v>41517819</v>
                 </e>
                 <e>
                     <k>elementid</k>
-                    <v>41169454</v>
+                    <v>41169314</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -30227,7 +30235,7 @@
                 </e>
                 <e>
                     <k>value</k>
-                    <v>884047</v>
+                    <v>884044</v>
                 </e>
                 <e>
                     <k>idx</k>
@@ -30249,7 +30257,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>41517960</v>
+                                    <v>41517819</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30265,7 +30273,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>41517960</v>
+                                    <v>41517819</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30281,7 +30289,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>41517960</v>
+                                    <v>41517819</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30297,7 +30305,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>41517960</v>
+                                    <v>41517819</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30313,7 +30321,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>41517960</v>
+                                    <v>41517819</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30329,7 +30337,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40983430</v>
+                                    <v>40983290</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30350,7 +30358,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40983430</v>
+                                    <v>40983290</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30371,12 +30379,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40983630</v>
+                                    <v>40983491</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>13</b>
-                                    <v>185823</v>
+                                    <v>185822</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30392,7 +30400,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40983430</v>
+                                    <v>40983290</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30413,7 +30421,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>41169454</v>
+                                    <v>41169314</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30714,7 +30722,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>308689</v>
+                                    <v>308688</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -30739,12 +30747,12 @@
                                 <b>
                                     <a>8</a>
                                     <b>13</b>
-                                    <v>75195</v>
+                                    <v>75194</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>29</b>
-                                    <v>70437</v>
+                                    <v>70436</v>
                                 </b>
                                 <b>
                                     <a>29</a>
@@ -30775,7 +30783,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>308696</v>
+                                    <v>308695</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -30785,12 +30793,12 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>76925</v>
+                                    <v>76924</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>38840</v>
+                                    <v>38839</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -30815,7 +30823,7 @@
                                 <b>
                                     <a>150</a>
                                     <b>471089</b>
-                                    <v>33754</v>
+                                    <v>33753</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30831,7 +30839,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>781511</v>
+                                    <v>781509</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30857,7 +30865,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>882313</v>
+                                    <v>882310</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30883,7 +30891,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>365376</v>
+                                    <v>365375</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -30913,7 +30921,7 @@
                                 <b>
                                     <a>28</a>
                                     <b>159</b>
-                                    <v>69846</v>
+                                    <v>69845</v>
                                 </b>
                                 <b>
                                     <a>159</a>
@@ -31461,7 +31469,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>20057</v>
+                                    <v>20056</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -31481,7 +31489,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>71</b>
-                                    <v>3414</v>
+                                    <v>3413</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31994,11 +32002,11 @@
         </relation>
         <relation>
             <name>xmlHasNs</name>
-            <cardinality>501577</cardinality>
+            <cardinality>501573</cardinality>
             <columnsizes>
                 <e>
                     <k>elementId</k>
-                    <v>501577</v>
+                    <v>501573</v>
                 </e>
                 <e>
                     <k>nsId</k>
@@ -32020,7 +32028,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>501577</v>
+                                    <v>501573</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32036,7 +32044,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>501577</v>
+                                    <v>501573</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32516,19 +32524,19 @@
         </relation>
         <relation>
             <name>xmlChars</name>
-            <cardinality>45379511</cardinality>
+            <cardinality>45379357</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>45379511</v>
+                    <v>45379357</v>
                 </e>
                 <e>
                     <k>text</k>
-                    <v>1700662</v>
+                    <v>1700656</v>
                 </e>
                 <e>
                     <k>parentid</k>
-                    <v>28480349</v>
+                    <v>28480252</v>
                 </e>
                 <e>
                     <k>idx</k>
@@ -32554,7 +32562,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>45379511</v>
+                                    <v>45379357</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32570,7 +32578,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>45379511</v>
+                                    <v>45379357</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32586,7 +32594,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>45379511</v>
+                                    <v>45379357</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32602,7 +32610,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>45379511</v>
+                                    <v>45379357</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32618,7 +32626,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>45379511</v>
+                                    <v>45379357</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32639,7 +32647,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>421882</v>
+                                    <v>421881</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -32659,12 +32667,12 @@
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>141441</v>
+                                    <v>141440</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>87852</v>
+                                    <v>87851</v>
                                 </b>
                                 <b>
                                     <a>9</a>
@@ -32674,7 +32682,7 @@
                                 <b>
                                     <a>12</a>
                                     <b>15</b>
-                                    <v>83186</v>
+                                    <v>83185</v>
                                 </b>
                                 <b>
                                     <a>15</a>
@@ -32705,12 +32713,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>165834</v>
+                                    <v>165833</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>421942</v>
+                                    <v>421941</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -32720,7 +32728,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>175866</v>
+                                    <v>175865</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -32740,7 +32748,7 @@
                                 <b>
                                     <a>9</a>
                                     <b>12</b>
-                                    <v>148677</v>
+                                    <v>148676</v>
                                 </b>
                                 <b>
                                     <a>12</a>
@@ -32755,12 +32763,12 @@
                                 <b>
                                     <a>19</a>
                                     <b>54</b>
-                                    <v>127684</v>
+                                    <v>127683</v>
                                 </b>
                                 <b>
                                     <a>54</a>
                                     <b>918936</b>
-                                    <v>93732</v>
+                                    <v>93731</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32776,12 +32784,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1668609</v>
+                                    <v>1668603</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>33</b>
-                                    <v>32053</v>
+                                    <v>32052</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32797,7 +32805,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1700660</v>
+                                    <v>1700654</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -32823,12 +32831,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>498940</v>
+                                    <v>498938</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>94931</v>
+                                    <v>94930</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -32843,12 +32851,12 @@
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>145526</v>
+                                    <v>145525</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>10</b>
-                                    <v>153688</v>
+                                    <v>153687</v>
                                 </b>
                                 <b>
                                     <a>10</a>
@@ -32863,7 +32871,7 @@
                                 <b>
                                     <a>17</a>
                                     <b>14127</b>
-                                    <v>118981</v>
+                                    <v>118980</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32879,22 +32887,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17038280</v>
+                                    <v>17038222</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8292992</v>
+                                    <v>8292964</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2084035</v>
+                                    <v>2084028</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>61</b>
-                                    <v>1065041</v>
+                                    <v>1065037</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32910,22 +32918,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17040164</v>
+                                    <v>17040106</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8301726</v>
+                                    <v>8301698</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2100188</v>
+                                    <v>2100181</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>47</b>
-                                    <v>1038269</v>
+                                    <v>1038266</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32941,22 +32949,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17038280</v>
+                                    <v>17038222</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8292992</v>
+                                    <v>8292964</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2084035</v>
+                                    <v>2084028</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>61</b>
-                                    <v>1065041</v>
+                                    <v>1065037</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32972,7 +32980,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28479968</v>
+                                    <v>28479871</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -32993,7 +33001,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28480349</v>
+                                    <v>28480252</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33688,15 +33696,15 @@
         </relation>
         <relation>
             <name>xmllocations</name>
-            <cardinality>147551916</cardinality>
+            <cardinality>147551414</cardinality>
             <columnsizes>
                 <e>
                     <k>xmlElement</k>
-                    <v>147546832</v>
+                    <v>147546330</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>128989681</v>
+                    <v>128989242</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33710,7 +33718,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>147546786</v>
+                                    <v>147546284</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -33731,17 +33739,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>110766476</v>
+                                    <v>110766100</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>18041929</v>
+                                    <v>18041868</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>15</b>
-                                    <v>181275</v>
+                                    <v>181274</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33751,11 +33759,11 @@
         </relation>
         <relation>
             <name>commentline</name>
-            <cardinality>1542316</cardinality>
+            <cardinality>1542302</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1542316</v>
+                    <v>1542302</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -33763,11 +33771,11 @@
                 </e>
                 <e>
                     <k>text</k>
-                    <v>576331</v>
+                    <v>576326</v>
                 </e>
                 <e>
                     <k>rawtext</k>
-                    <v>581672</v>
+                    <v>581666</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33781,7 +33789,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1542316</v>
+                                    <v>1542302</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33797,7 +33805,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1542316</v>
+                                    <v>1542302</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33813,7 +33821,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1542316</v>
+                                    <v>1542302</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33907,7 +33915,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>482114</v>
+                                    <v>482110</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -33917,7 +33925,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>21079</b>
-                                    <v>40791</v>
+                                    <v>40790</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33933,7 +33941,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>574463</v>
+                                    <v>574458</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -33954,12 +33962,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>572802</v>
+                                    <v>572797</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>40</b>
-                                    <v>3529</v>
+                                    <v>3528</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33975,12 +33983,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>487842</v>
+                                    <v>487837</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>52897</v>
+                                    <v>52896</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -34001,7 +34009,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>581672</v>
+                                    <v>581666</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34017,7 +34025,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>581672</v>
+                                    <v>581666</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34027,15 +34035,15 @@
         </relation>
         <relation>
             <name>commentline_location</name>
-            <cardinality>1542316</cardinality>
+            <cardinality>1542302</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1542316</v>
+                    <v>1542302</v>
                 </e>
                 <e>
                     <k>loc</k>
-                    <v>1542316</v>
+                    <v>1542302</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34049,7 +34057,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1542316</v>
+                                    <v>1542302</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34065,7 +34073,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1542316</v>
+                                    <v>1542302</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34075,26 +34083,26 @@
         </relation>
         <relation>
             <name>commentblock</name>
-            <cardinality>374970</cardinality>
+            <cardinality>374967</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>374970</v>
+                    <v>374967</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>commentblock_location</name>
-            <cardinality>374970</cardinality>
+            <cardinality>374967</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>374970</v>
+                    <v>374967</v>
                 </e>
                 <e>
                     <k>loc</k>
-                    <v>374970</v>
+                    <v>374967</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34108,7 +34116,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>374970</v>
+                                    <v>374967</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34124,7 +34132,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>374970</v>
+                                    <v>374967</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34134,15 +34142,15 @@
         </relation>
         <relation>
             <name>commentblock_binding</name>
-            <cardinality>1356034</cardinality>
+            <cardinality>1356021</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>374970</v>
+                    <v>374967</v>
                 </e>
                 <e>
                     <k>entity</k>
-                    <v>587088</v>
+                    <v>587083</v>
                 </e>
                 <e>
                     <k>bindtype</k>
@@ -34165,12 +34173,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>86989</v>
+                                    <v>86988</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>264873</v>
+                                    <v>264871</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34186,17 +34194,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>3</b>
-                                    <v>23382</v>
+                                    <v>23381</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>86715</v>
+                                    <v>86714</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>264873</v>
+                                    <v>264871</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34212,17 +34220,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>415337</v>
+                                    <v>415333</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>139839</v>
+                                    <v>139837</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>524</b>
-                                    <v>31912</v>
+                                    <v>31911</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34238,17 +34246,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>222402</v>
+                                    <v>222400</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>230404</v>
+                                    <v>230402</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>124694</v>
+                                    <v>124693</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -34325,15 +34333,15 @@
         </relation>
         <relation>
             <name>commentblock_child</name>
-            <cardinality>1901595</cardinality>
+            <cardinality>1901577</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>374970</v>
+                    <v>374967</v>
                 </e>
                 <e>
                     <k>commentline</k>
-                    <v>1541684</v>
+                    <v>1541669</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -34351,17 +34359,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>116560</v>
+                                    <v>116559</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>36356</v>
+                                    <v>36355</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>86073</v>
+                                    <v>86072</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -34371,12 +34379,12 @@
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>48132</v>
+                                    <v>48131</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>32865</v>
+                                    <v>32864</v>
                                 </b>
                                 <b>
                                     <a>10</a>
@@ -34402,7 +34410,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>114183</v>
+                                    <v>114182</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -34448,7 +34456,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1541684</v>
+                                    <v>1541669</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34464,12 +34472,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1181773</v>
+                                    <v>1181761</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>359911</v>
+                                    <v>359907</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34581,11 +34589,11 @@
         </relation>
         <relation>
             <name>asp_elements</name>
-            <cardinality>148402</cardinality>
+            <cardinality>148401</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>148402</v>
+                    <v>148401</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -34593,7 +34601,7 @@
                 </e>
                 <e>
                     <k>loc</k>
-                    <v>148402</v>
+                    <v>148401</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34607,7 +34615,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>148402</v>
+                                    <v>148401</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34623,7 +34631,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>148402</v>
+                                    <v>148401</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34751,7 +34759,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>148402</v>
+                                    <v>148401</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34767,7 +34775,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>148402</v>
+                                    <v>148401</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35368,11 +35376,11 @@
         </relation>
         <relation>
             <name>asp_element_body</name>
-            <cardinality>118618</cardinality>
+            <cardinality>118617</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
-                    <v>118618</v>
+                    <v>118617</v>
                 </e>
                 <e>
                     <k>body</k>
@@ -35390,7 +35398,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>118618</v>
+                                    <v>118617</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36216,11 +36224,11 @@
         </relation>
         <relation>
             <name>cil_instruction</name>
-            <cardinality>504260704</cardinality>
+            <cardinality>504255988</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>504260704</v>
+                    <v>504255988</v>
                 </e>
                 <e>
                     <k>opcode</k>
@@ -36228,11 +36236,11 @@
                 </e>
                 <e>
                     <k>index</k>
-                    <v>1697213</v>
+                    <v>1697197</v>
                 </e>
                 <e>
                     <k>impl</k>
-                    <v>23978900</v>
+                    <v>23978675</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36246,7 +36254,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>504260704</v>
+                                    <v>504255988</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36262,7 +36270,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>504260704</v>
+                                    <v>504255988</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36278,7 +36286,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>504260704</v>
+                                    <v>504255988</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36522,47 +36530,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>352005</v>
+                                    <v>352001</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5788</v>
+                                    <v>5787</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>466938</v>
+                                    <v>466933</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>116203</v>
+                                    <v>116201</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>205090</v>
+                                    <v>205088</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>15</b>
-                                    <v>83276</v>
+                                    <v>83275</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>16</b>
-                                    <v>145172</v>
+                                    <v>145171</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>20</b>
-                                    <v>144670</v>
+                                    <v>144669</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>126</b>
-                                    <v>127395</v>
+                                    <v>127393</v>
                                 </b>
                                 <b>
                                     <a>126</a>
@@ -36583,42 +36591,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>713164</v>
+                                    <v>713158</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>246078</v>
+                                    <v>246076</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>152584</v>
+                                    <v>152583</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>101880</v>
+                                    <v>101879</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>152496</v>
+                                    <v>152494</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>11</b>
-                                    <v>130052</v>
+                                    <v>130051</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>29</b>
-                                    <v>129462</v>
+                                    <v>129461</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>177</b>
-                                    <v>71493</v>
+                                    <v>71492</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36634,47 +36642,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>352005</v>
+                                    <v>352001</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5788</v>
+                                    <v>5787</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>466938</v>
+                                    <v>466933</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>116203</v>
+                                    <v>116201</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>205090</v>
+                                    <v>205088</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>15</b>
-                                    <v>83276</v>
+                                    <v>83275</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>16</b>
-                                    <v>145172</v>
+                                    <v>145171</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>20</b>
-                                    <v>144670</v>
+                                    <v>144669</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>126</b>
-                                    <v>127395</v>
+                                    <v>127393</v>
                                 </b>
                                 <b>
                                     <a>126</a>
@@ -36695,57 +36703,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>3</b>
-                                    <v>1768175</v>
+                                    <v>1768159</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5292243</v>
+                                    <v>5292193</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>2487040</v>
+                                    <v>2487016</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>1620227</v>
+                                    <v>1620212</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>1895748</v>
+                                    <v>1895730</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>1892411</v>
+                                    <v>1892393</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>16</b>
-                                    <v>1968659</v>
+                                    <v>1968640</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>23</b>
-                                    <v>1813062</v>
+                                    <v>1813045</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>35</b>
-                                    <v>1856944</v>
+                                    <v>1856927</v>
                                 </b>
                                 <b>
                                     <a>35</a>
                                     <b>67</b>
-                                    <v>1825790</v>
+                                    <v>1825773</v>
                                 </b>
                                 <b>
                                     <a>67</a>
                                     <b>57474</b>
-                                    <v>1558597</v>
+                                    <v>1558582</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36761,52 +36769,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>3</b>
-                                    <v>1771808</v>
+                                    <v>1771791</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5485048</v>
+                                    <v>5484997</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>2836594</v>
+                                    <v>2836567</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>2484441</v>
+                                    <v>2484418</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>1600973</v>
+                                    <v>1600958</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>2124669</v>
+                                    <v>2124649</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>12</b>
-                                    <v>2168581</v>
+                                    <v>2168561</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>16</b>
-                                    <v>2034335</v>
+                                    <v>2034316</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>24</b>
-                                    <v>1878207</v>
+                                    <v>1878189</v>
                                 </b>
                                 <b>
                                     <a>24</a>
                                     <b>77</b>
-                                    <v>1594240</v>
+                                    <v>1594225</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36822,57 +36830,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>3</b>
-                                    <v>1768175</v>
+                                    <v>1768159</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5292243</v>
+                                    <v>5292193</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>2487040</v>
+                                    <v>2487016</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>1620227</v>
+                                    <v>1620212</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>1895748</v>
+                                    <v>1895730</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>1892411</v>
+                                    <v>1892393</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>16</b>
-                                    <v>1968659</v>
+                                    <v>1968640</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>23</b>
-                                    <v>1813062</v>
+                                    <v>1813045</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>35</b>
-                                    <v>1856944</v>
+                                    <v>1856927</v>
                                 </b>
                                 <b>
                                     <a>35</a>
                                     <b>67</b>
-                                    <v>1825790</v>
+                                    <v>1825773</v>
                                 </b>
                                 <b>
                                     <a>67</a>
                                     <b>57474</b>
-                                    <v>1558597</v>
+                                    <v>1558582</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36882,15 +36890,15 @@
         </relation>
         <relation>
             <name>cil_jump</name>
-            <cardinality>38654205</cardinality>
+            <cardinality>38653843</cardinality>
             <columnsizes>
                 <e>
                     <k>instruction</k>
-                    <v>38654205</v>
+                    <v>38653843</v>
                 </e>
                 <e>
                     <k>target</k>
-                    <v>29345826</v>
+                    <v>29345551</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36904,7 +36912,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>38654205</v>
+                                    <v>38653843</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36920,17 +36928,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>24482485</v>
+                                    <v>24482256</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3200027</v>
+                                    <v>3199997</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>473</b>
-                                    <v>1663312</v>
+                                    <v>1663297</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36940,15 +36948,15 @@
         </relation>
         <relation>
             <name>cil_access</name>
-            <cardinality>205357557</cardinality>
+            <cardinality>205355636</cardinality>
             <columnsizes>
                 <e>
                     <k>instruction</k>
-                    <v>205357557</v>
+                    <v>205355636</v>
                 </e>
                 <e>
                     <k>target</k>
-                    <v>48924367</v>
+                    <v>48923909</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36962,7 +36970,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>205357557</v>
+                                    <v>205355636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36978,32 +36986,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20166732</v>
+                                    <v>20166543</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12282703</v>
+                                    <v>12282589</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5954349</v>
+                                    <v>5954293</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>3067877</v>
+                                    <v>3067849</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>4125074</v>
+                                    <v>4125035</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>72956</b>
-                                    <v>3327629</v>
+                                    <v>3327598</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37013,15 +37021,15 @@
         </relation>
         <relation>
             <name>cil_value</name>
-            <cardinality>19775953</cardinality>
+            <cardinality>19775768</cardinality>
             <columnsizes>
                 <e>
                     <k>instruction</k>
-                    <v>19775953</v>
+                    <v>19775768</v>
                 </e>
                 <e>
                     <k>value</k>
-                    <v>4923700</v>
+                    <v>4923654</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37035,7 +37043,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19775953</v>
+                                    <v>19775768</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37051,22 +37059,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3687282</v>
+                                    <v>3687248</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>676753</v>
+                                    <v>676747</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>372292</v>
+                                    <v>372289</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>182148</b>
-                                    <v>187371</v>
+                                    <v>187370</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37076,19 +37084,19 @@
         </relation>
         <relation>
             <name>cil_switch</name>
-            <cardinality>4070472</cardinality>
+            <cardinality>4070434</cardinality>
             <columnsizes>
                 <e>
                     <k>instruction</k>
-                    <v>272685</v>
+                    <v>272683</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>141510</v>
+                    <v>141509</v>
                 </e>
                 <e>
                     <k>target</k>
-                    <v>1795403</v>
+                    <v>1795386</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37107,17 +37115,17 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>75037</v>
+                                    <v>75036</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>45979</v>
+                                    <v>45978</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>32454</v>
+                                    <v>32453</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -37168,12 +37176,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>33340</v>
+                                    <v>33339</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>96919</v>
+                                    <v>96918</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -37219,7 +37227,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>70489</v>
+                                    <v>70488</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -37234,7 +37242,7 @@
                                 <b>
                                     <a>15</a>
                                     <b>655</b>
-                                    <v>10631</v>
+                                    <v>10630</v>
                                 </b>
                                 <b>
                                     <a>688</a>
@@ -37260,7 +37268,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>70489</v>
+                                    <v>70488</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -37275,7 +37283,7 @@
                                 <b>
                                     <a>15</a>
                                     <b>645</b>
-                                    <v>10631</v>
+                                    <v>10630</v>
                                 </b>
                                 <b>
                                     <a>675</a>
@@ -37296,12 +37304,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1771690</v>
+                                    <v>1771673</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>18</b>
-                                    <v>23713</v>
+                                    <v>23712</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37317,12 +37325,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1596219</v>
+                                    <v>1596204</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>141422</v>
+                                    <v>141420</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -37379,15 +37387,15 @@
         </relation>
         <relation>
             <name>cil_type_location</name>
-            <cardinality>4842462</cardinality>
+            <cardinality>4842416</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4842462</v>
+                    <v>4842416</v>
                 </e>
                 <e>
                     <k>loc</k>
-                    <v>14588</v>
+                    <v>14587</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37401,7 +37409,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4842462</v>
+                                    <v>4842416</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37477,11 +37485,11 @@
         </relation>
         <relation>
             <name>cil_method_location</name>
-            <cardinality>29356250</cardinality>
+            <cardinality>29355975</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>29356250</v>
+                    <v>29355975</v>
                 </e>
                 <e>
                     <k>loc</k>
@@ -37499,7 +37507,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29356250</v>
+                                    <v>29355975</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37590,15 +37598,15 @@
         </relation>
         <relation>
             <name>cil_type</name>
-            <cardinality>12399763</cardinality>
+            <cardinality>12399647</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12399763</v>
+                    <v>12399647</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>3497607</v>
+                    <v>3497574</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -37606,11 +37614,11 @@
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>2509483</v>
+                    <v>2509459</v>
                 </e>
                 <e>
                     <k>sourceDecl</k>
-                    <v>6934884</v>
+                    <v>6934819</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37624,7 +37632,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12399763</v>
+                                    <v>12399647</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37640,7 +37648,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12399763</v>
+                                    <v>12399647</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37656,7 +37664,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12399763</v>
+                                    <v>12399647</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37672,7 +37680,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12399763</v>
+                                    <v>12399647</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37688,17 +37696,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3073163</v>
+                                    <v>3073135</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>292855</v>
+                                    <v>292852</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>45085</b>
-                                    <v>131588</v>
+                                    <v>131587</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37714,7 +37722,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3497607</v>
+                                    <v>3497574</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37730,12 +37738,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3232334</v>
+                                    <v>3232303</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>48</b>
-                                    <v>262409</v>
+                                    <v>262406</v>
                                 </b>
                                 <b>
                                     <a>48</a>
@@ -37756,17 +37764,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3194150</v>
+                                    <v>3194121</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>271947</v>
+                                    <v>271945</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>45085</b>
-                                    <v>31509</v>
+                                    <v>31508</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37921,27 +37929,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1632423</v>
+                                    <v>1632408</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>460795</v>
+                                    <v>460791</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>196792</v>
+                                    <v>196790</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>28</b>
-                                    <v>189025</v>
+                                    <v>189023</v>
                                 </b>
                                 <b>
                                     <a>28</a>
                                     <b>56074</b>
-                                    <v>30446</v>
+                                    <v>30445</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37957,22 +37965,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1641164</v>
+                                    <v>1641149</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>468149</v>
+                                    <v>468144</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>196821</v>
+                                    <v>196819</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>38</b>
-                                    <v>188671</v>
+                                    <v>188669</v>
                                 </b>
                                 <b>
                                     <a>38</a>
@@ -37993,12 +38001,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2470739</v>
+                                    <v>2470716</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>38744</v>
+                                    <v>38743</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38014,22 +38022,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1640633</v>
+                                    <v>1640617</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>467971</v>
+                                    <v>467967</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>196821</v>
+                                    <v>196819</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>38</b>
-                                    <v>188700</v>
+                                    <v>188698</v>
                                 </b>
                                 <b>
                                     <a>38</a>
@@ -38050,12 +38058,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6636063</v>
+                                    <v>6636001</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>23276</b>
-                                    <v>298820</v>
+                                    <v>298817</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38071,7 +38079,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6934884</v>
+                                    <v>6934819</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38087,7 +38095,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6934884</v>
+                                    <v>6934819</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38103,12 +38111,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6836960</v>
+                                    <v>6836896</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1652</b>
-                                    <v>97923</v>
+                                    <v>97922</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38166,15 +38174,15 @@
         </relation>
         <relation>
             <name>cil_array_type</name>
-            <cardinality>181790</cardinality>
+            <cardinality>181788</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>181790</v>
+                    <v>181788</v>
                 </e>
                 <e>
                     <k>element_type</k>
-                    <v>181199</v>
+                    <v>181198</v>
                 </e>
                 <e>
                     <k>rank</k>
@@ -38192,7 +38200,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>181790</v>
+                                    <v>181788</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38208,7 +38216,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>181790</v>
+                                    <v>181788</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38224,7 +38232,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>180668</v>
+                                    <v>180666</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -38245,7 +38253,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>180668</v>
+                                    <v>180666</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -38385,23 +38393,23 @@
         </relation>
         <relation>
             <name>cil_method</name>
-            <cardinality>39373777</cardinality>
+            <cardinality>39373409</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>39373777</v>
+                    <v>39373409</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>7889520</v>
+                    <v>7889447</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>7602010</v>
+                    <v>7601939</v>
                 </e>
                 <e>
                     <k>return_type</k>
-                    <v>3365930</v>
+                    <v>3365899</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -38415,7 +38423,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39373777</v>
+                                    <v>39373409</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38431,7 +38439,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39373777</v>
+                                    <v>39373409</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38447,7 +38455,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39373777</v>
+                                    <v>39373409</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38463,27 +38471,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5260940</v>
+                                    <v>5260891</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1204170</v>
+                                    <v>1204159</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>695180</v>
+                                    <v>695174</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>19</b>
-                                    <v>592856</v>
+                                    <v>592851</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>206309</b>
-                                    <v>136372</v>
+                                    <v>136371</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38499,22 +38507,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5492194</v>
+                                    <v>5492143</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1123167</v>
+                                    <v>1123157</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>645244</v>
+                                    <v>645238</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>48</b>
-                                    <v>591941</v>
+                                    <v>591935</v>
                                 </b>
                                 <b>
                                     <a>48</a>
@@ -38535,17 +38543,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7115788</v>
+                                    <v>7115722</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>616717</v>
+                                    <v>616711</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>10798</b>
-                                    <v>157014</v>
+                                    <v>157012</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38561,37 +38569,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2404058</v>
+                                    <v>2404036</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1743783</v>
+                                    <v>1743767</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>872216</v>
+                                    <v>872208</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>624395</v>
+                                    <v>624389</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>648758</v>
+                                    <v>648752</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>11</b>
-                                    <v>655048</v>
+                                    <v>655042</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>39</b>
-                                    <v>572894</v>
+                                    <v>572888</v>
                                 </b>
                                 <b>
                                     <a>39</a>
@@ -38612,37 +38620,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2458365</v>
+                                    <v>2458342</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1772487</v>
+                                    <v>1772470</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>893892</v>
+                                    <v>893883</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>633550</v>
+                                    <v>633544</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>698104</v>
+                                    <v>698097</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>11</b>
-                                    <v>599442</v>
+                                    <v>599436</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>3640</b>
-                                    <v>546168</v>
+                                    <v>546163</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38658,32 +38666,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3242994</v>
+                                    <v>3242964</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2011094</v>
+                                    <v>2011076</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>858366</v>
+                                    <v>858358</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>456927</v>
+                                    <v>456923</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>614059</v>
+                                    <v>614054</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>12757</b>
-                                    <v>418567</v>
+                                    <v>418563</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38699,27 +38707,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2033124</v>
+                                    <v>2033105</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>586123</v>
+                                    <v>586118</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>222572</v>
+                                    <v>222570</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>285561</v>
+                                    <v>285558</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>508819</b>
-                                    <v>238548</v>
+                                    <v>238546</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38735,22 +38743,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2303713</v>
+                                    <v>2303692</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>542595</v>
+                                    <v>542590</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>273778</v>
+                                    <v>273775</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>78481</b>
-                                    <v>245842</v>
+                                    <v>245840</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38766,27 +38774,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2200592</v>
+                                    <v>2200572</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>562588</v>
+                                    <v>562582</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>209874</v>
+                                    <v>209872</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>261818</v>
+                                    <v>261816</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>207300</b>
-                                    <v>131056</v>
+                                    <v>131055</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38796,15 +38804,15 @@
         </relation>
         <relation>
             <name>cil_method_source_declaration</name>
-            <cardinality>34929152</cardinality>
+            <cardinality>34928825</cardinality>
             <columnsizes>
                 <e>
                     <k>method</k>
-                    <v>34929152</v>
+                    <v>34928825</v>
                 </e>
                 <e>
                     <k>source</k>
-                    <v>30419382</v>
+                    <v>30419098</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -38818,7 +38826,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>34929152</v>
+                                    <v>34928825</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38834,12 +38842,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28648401</v>
+                                    <v>28648133</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>981</b>
-                                    <v>1770981</v>
+                                    <v>1770964</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38849,15 +38857,15 @@
         </relation>
         <relation>
             <name>cil_method_implementation</name>
-            <cardinality>27073001</cardinality>
+            <cardinality>27072747</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>27073001</v>
+                    <v>27072747</v>
                 </e>
                 <e>
                     <k>method</k>
-                    <v>27049967</v>
+                    <v>27049714</v>
                 </e>
                 <e>
                     <k>location</k>
@@ -38875,7 +38883,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27073001</v>
+                                    <v>27072747</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38891,7 +38899,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27073001</v>
+                                    <v>27072747</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38907,12 +38915,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27047073</v>
+                                    <v>27046820</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>27</b>
-                                    <v>2894</v>
+                                    <v>2893</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38928,7 +38936,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27049967</v>
+                                    <v>27049714</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39090,15 +39098,15 @@
         </relation>
         <relation>
             <name>cil_implements</name>
-            <cardinality>1403915</cardinality>
+            <cardinality>1403902</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1403325</v>
+                    <v>1403311</v>
                 </e>
                 <e>
                     <k>decl</k>
-                    <v>259544</v>
+                    <v>259542</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -39112,7 +39120,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1402734</v>
+                                    <v>1402721</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -39133,12 +39141,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>169860</v>
+                                    <v>169858</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>42701</v>
+                                    <v>42700</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -39148,12 +39156,12 @@
                                 <b>
                                     <a>4</a>
                                     <b>10</b>
-                                    <v>19815</v>
+                                    <v>19814</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>3161</b>
-                                    <v>10129</v>
+                                    <v>10128</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39163,23 +39171,23 @@
         </relation>
         <relation>
             <name>cil_field</name>
-            <cardinality>15899467</cardinality>
+            <cardinality>15899318</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>15899467</v>
+                    <v>15899318</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>3685983</v>
+                    <v>3685949</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>6243572</v>
+                    <v>6243513</v>
                 </e>
                 <e>
                     <k>field_type</k>
-                    <v>3062916</v>
+                    <v>3062888</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -39193,7 +39201,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15899467</v>
+                                    <v>15899318</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39209,7 +39217,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15899467</v>
+                                    <v>15899318</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39225,7 +39233,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15899467</v>
+                                    <v>15899318</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39241,42 +39249,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1083833</v>
+                                    <v>1083822</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>913352</v>
+                                    <v>913344</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>486546</v>
+                                    <v>486542</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>328173</v>
+                                    <v>328170</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>220977</v>
+                                    <v>220975</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>262556</v>
+                                    <v>262554</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>15</b>
-                                    <v>285797</v>
+                                    <v>285794</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>6824</b>
-                                    <v>104745</v>
+                                    <v>104744</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39292,42 +39300,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1083833</v>
+                                    <v>1083822</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>913352</v>
+                                    <v>913344</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>486546</v>
+                                    <v>486542</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>328173</v>
+                                    <v>328170</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>220977</v>
+                                    <v>220975</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>262556</v>
+                                    <v>262554</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>15</b>
-                                    <v>285797</v>
+                                    <v>285794</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>6824</b>
-                                    <v>104745</v>
+                                    <v>104744</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39343,32 +39351,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1248614</v>
+                                    <v>1248602</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1218965</v>
+                                    <v>1218953</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>465934</v>
+                                    <v>465929</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>247702</v>
+                                    <v>247700</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>323921</v>
+                                    <v>323918</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>524</b>
-                                    <v>180845</v>
+                                    <v>180843</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39384,22 +39392,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4788627</v>
+                                    <v>4788582</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>792897</v>
+                                    <v>792889</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>498152</v>
+                                    <v>498147</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>13940</b>
-                                    <v>163894</v>
+                                    <v>163893</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39415,22 +39423,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4788627</v>
+                                    <v>4788582</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>792897</v>
+                                    <v>792889</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>498152</v>
+                                    <v>498147</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>13940</b>
-                                    <v>163894</v>
+                                    <v>163893</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39446,17 +39454,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5453746</v>
+                                    <v>5453695</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>488968</v>
+                                    <v>488963</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>12921</b>
-                                    <v>300858</v>
+                                    <v>300855</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39472,27 +39480,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1844158</v>
+                                    <v>1844140</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>591203</v>
+                                    <v>591197</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>171750</v>
+                                    <v>171748</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>244247</v>
+                                    <v>244245</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>58308</b>
-                                    <v>211557</v>
+                                    <v>211555</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39508,22 +39516,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2063098</v>
+                                    <v>2063079</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>593654</v>
+                                    <v>593648</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>251807</v>
+                                    <v>251805</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>22697</b>
-                                    <v>154356</v>
+                                    <v>154355</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39539,22 +39547,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2244002</v>
+                                    <v>2243981</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>356316</v>
+                                    <v>356313</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>237987</v>
+                                    <v>237985</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>33056</b>
-                                    <v>224609</v>
+                                    <v>224607</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39564,15 +39572,15 @@
         </relation>
         <relation>
             <name>cil_parameter</name>
-            <cardinality>75119038</cardinality>
+            <cardinality>75118336</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>75119038</v>
+                    <v>75118336</v>
                 </e>
                 <e>
                     <k>parameterizable</k>
-                    <v>37743421</v>
+                    <v>37743068</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -39580,7 +39588,7 @@
                 </e>
                 <e>
                     <k>param_type</k>
-                    <v>9706924</v>
+                    <v>9706833</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -39594,7 +39602,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>75119038</v>
+                                    <v>75118336</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39610,7 +39618,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>75119038</v>
+                                    <v>75118336</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39626,7 +39634,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>75119038</v>
+                                    <v>75118336</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39642,27 +39650,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16498466</v>
+                                    <v>16498312</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12068636</v>
+                                    <v>12068523</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5792078</v>
+                                    <v>5792024</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>2932037</v>
+                                    <v>2932009</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>57</b>
-                                    <v>452202</v>
+                                    <v>452198</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39678,27 +39686,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16498466</v>
+                                    <v>16498312</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12068636</v>
+                                    <v>12068523</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5792078</v>
+                                    <v>5792024</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>2932037</v>
+                                    <v>2932009</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>57</b>
-                                    <v>452202</v>
+                                    <v>452198</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39714,22 +39722,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16985988</v>
+                                    <v>16985829</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12300274</v>
+                                    <v>12300159</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5685768</v>
+                                    <v>5685715</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>43</b>
-                                    <v>2771390</v>
+                                    <v>2771364</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39928,42 +39936,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2729575</v>
+                                    <v>2729549</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2863142</v>
+                                    <v>2863115</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1063663</v>
+                                    <v>1063653</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>653955</v>
+                                    <v>653949</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>740805</v>
+                                    <v>740798</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>11</b>
-                                    <v>735224</v>
+                                    <v>735217</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>36</b>
-                                    <v>733481</v>
+                                    <v>733474</v>
                                 </b>
                                 <b>
                                     <a>36</a>
                                     <b>108909</b>
-                                    <v>187076</v>
+                                    <v>187074</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39979,42 +39987,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2768466</v>
+                                    <v>2768441</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2861370</v>
+                                    <v>2861343</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1055365</v>
+                                    <v>1055355</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>645096</v>
+                                    <v>645090</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>739919</v>
+                                    <v>739912</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>11</b>
-                                    <v>731916</v>
+                                    <v>731909</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>37</b>
-                                    <v>728668</v>
+                                    <v>728661</v>
                                 </b>
                                 <b>
                                     <a>37</a>
                                     <b>89965</b>
-                                    <v>176120</v>
+                                    <v>176119</v>
                                 </b>
                             </bs>
                         </hist>
@@ -40030,17 +40038,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6826329</v>
+                                    <v>6826265</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2083267</v>
+                                    <v>2083248</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>729111</v>
+                                    <v>729104</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -40055,37 +40063,37 @@
         </relation>
         <relation>
             <name>cil_parameter_in</name>
-            <cardinality>358354</cardinality>
+            <cardinality>358350</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>358354</v>
+                    <v>358350</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>cil_parameter_out</name>
-            <cardinality>683899</cardinality>
+            <cardinality>683893</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>683899</v>
+                    <v>683893</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>cil_setter</name>
-            <cardinality>1074353</cardinality>
+            <cardinality>1074343</cardinality>
             <columnsizes>
                 <e>
                     <k>prop</k>
-                    <v>1074353</v>
+                    <v>1074343</v>
                 </e>
                 <e>
                     <k>method</k>
-                    <v>1074353</v>
+                    <v>1074343</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -40099,7 +40107,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1074353</v>
+                                    <v>1074343</v>
                                 </b>
                             </bs>
                         </hist>
@@ -40115,7 +40123,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1074353</v>
+                                    <v>1074343</v>
                                 </b>
                             </bs>
                         </hist>
@@ -40125,11 +40133,11 @@
         </relation>
         <relation>
             <name>cil_custom_modifiers</name>
-            <cardinality>217995</cardinality>
+            <cardinality>217993</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>197796</v>
+                    <v>197794</v>
                 </e>
                 <e>
                     <k>modifier</k>
@@ -40151,7 +40159,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>177744</v>
+                                    <v>177743</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -40172,12 +40180,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>196349</v>
+                                    <v>196347</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1447</v>
+                                    <v>1446</v>
                                 </b>
                             </bs>
                         </hist>
@@ -40341,11 +40349,11 @@
         </relation>
         <relation>
             <name>cil_type_annotation</name>
-            <cardinality>1751904</cardinality>
+            <cardinality>1751888</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1751904</v>
+                    <v>1751888</v>
                 </e>
                 <e>
                     <k>annotation</k>
@@ -40363,7 +40371,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1751904</v>
+                                    <v>1751888</v>
                                 </b>
                             </bs>
                         </hist>
@@ -40389,15 +40397,15 @@
         </relation>
         <relation>
             <name>cil_getter</name>
-            <cardinality>5994363</cardinality>
+            <cardinality>5994307</cardinality>
             <columnsizes>
                 <e>
                     <k>prop</k>
-                    <v>5994363</v>
+                    <v>5994307</v>
                 </e>
                 <e>
                     <k>method</k>
-                    <v>5994363</v>
+                    <v>5994307</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -40411,7 +40419,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5994363</v>
+                                    <v>5994307</v>
                                 </b>
                             </bs>
                         </hist>
@@ -40427,7 +40435,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5994363</v>
+                                    <v>5994307</v>
                                 </b>
                             </bs>
                         </hist>
@@ -40437,15 +40445,15 @@
         </relation>
         <relation>
             <name>cil_adder</name>
-            <cardinality>70696</cardinality>
+            <cardinality>70695</cardinality>
             <columnsizes>
                 <e>
                     <k>event</k>
-                    <v>70696</v>
+                    <v>70695</v>
                 </e>
                 <e>
                     <k>method</k>
-                    <v>70873</v>
+                    <v>70872</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -40459,7 +40467,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>70696</v>
+                                    <v>70695</v>
                                 </b>
                             </bs>
                         </hist>
@@ -40475,7 +40483,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>70873</v>
+                                    <v>70872</v>
                                 </b>
                             </bs>
                         </hist>
@@ -40485,15 +40493,15 @@
         </relation>
         <relation>
             <name>cil_remover</name>
-            <cardinality>70696</cardinality>
+            <cardinality>70695</cardinality>
             <columnsizes>
                 <e>
                     <k>event</k>
-                    <v>70696</v>
+                    <v>70695</v>
                 </e>
                 <e>
                     <k>method</k>
-                    <v>70873</v>
+                    <v>70872</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -40507,7 +40515,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>70696</v>
+                                    <v>70695</v>
                                 </b>
                             </bs>
                         </hist>
@@ -40523,7 +40531,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>70873</v>
+                                    <v>70872</v>
                                 </b>
                             </bs>
                         </hist>
@@ -40581,23 +40589,23 @@
         </relation>
         <relation>
             <name>cil_property</name>
-            <cardinality>6002749</cardinality>
+            <cardinality>6002693</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6002749</v>
+                    <v>6002693</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>1591435</v>
+                    <v>1591420</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1540967</v>
+                    <v>1540952</v>
                 </e>
                 <e>
                     <k>property_type</k>
-                    <v>706667</v>
+                    <v>706661</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -40611,7 +40619,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6002749</v>
+                                    <v>6002693</v>
                                 </b>
                             </bs>
                         </hist>
@@ -40627,7 +40635,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6002749</v>
+                                    <v>6002693</v>
                                 </b>
                             </bs>
                         </hist>
@@ -40643,7 +40651,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6002749</v>
+                                    <v>6002693</v>
                                 </b>
                             </bs>
                         </hist>
@@ -40659,32 +40667,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>521629</v>
+                                    <v>521624</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>392402</v>
+                                    <v>392399</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>215484</v>
+                                    <v>215482</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>137258</v>
+                                    <v>137257</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>139502</v>
+                                    <v>139501</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>13</b>
-                                    <v>124442</v>
+                                    <v>124440</v>
                                 </b>
                                 <b>
                                     <a>13</a>
@@ -40705,37 +40713,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>624838</v>
+                                    <v>624832</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>291408</v>
+                                    <v>291405</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>215544</v>
+                                    <v>215542</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>136520</v>
+                                    <v>136518</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>139738</v>
+                                    <v>139737</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>13</b>
-                                    <v>124087</v>
+                                    <v>124086</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>2090</b>
-                                    <v>59297</v>
+                                    <v>59296</v>
                                 </b>
                             </bs>
                         </hist>
@@ -40751,27 +40759,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>615625</v>
+                                    <v>615619</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>481851</v>
+                                    <v>481846</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>202137</v>
+                                    <v>202135</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>101053</v>
+                                    <v>101052</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>125268</v>
+                                    <v>125267</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -40792,27 +40800,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>979206</v>
+                                    <v>979196</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>254760</v>
+                                    <v>254758</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>95118</v>
+                                    <v>95117</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>120248</v>
+                                    <v>120247</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>7161</b>
-                                    <v>91633</v>
+                                    <v>91632</v>
                                 </b>
                             </bs>
                         </hist>
@@ -40828,27 +40836,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>979206</v>
+                                    <v>979196</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>255203</v>
+                                    <v>255201</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>95177</v>
+                                    <v>95176</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>120219</v>
+                                    <v>120218</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>3695</b>
-                                    <v>91161</v>
+                                    <v>91160</v>
                                 </b>
                             </bs>
                         </hist>
@@ -40864,17 +40872,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1346862</v>
+                                    <v>1346849</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>113161</v>
+                                    <v>113160</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>1330</b>
-                                    <v>80943</v>
+                                    <v>80942</v>
                                 </b>
                             </bs>
                         </hist>
@@ -40890,17 +40898,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>410209</v>
+                                    <v>410206</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>125239</v>
+                                    <v>125238</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>46038</v>
+                                    <v>46037</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -40910,7 +40918,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>34</b>
-                                    <v>53096</v>
+                                    <v>53095</v>
                                 </b>
                                 <b>
                                     <a>34</a>
@@ -40931,12 +40939,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>430172</v>
+                                    <v>430168</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>118831</v>
+                                    <v>118830</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -40951,12 +40959,12 @@
                                 <b>
                                     <a>7</a>
                                     <b>64</b>
-                                    <v>53007</v>
+                                    <v>53006</v>
                                 </b>
                                 <b>
                                     <a>64</a>
                                     <b>17546</b>
-                                    <v>4843</v>
+                                    <v>4842</v>
                                 </b>
                             </bs>
                         </hist>
@@ -40972,12 +40980,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>559812</v>
+                                    <v>559806</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>81534</v>
+                                    <v>81533</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -40997,15 +41005,15 @@
         </relation>
         <relation>
             <name>cil_event</name>
-            <cardinality>70696</cardinality>
+            <cardinality>70695</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>70696</v>
+                    <v>70695</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>30062</v>
+                    <v>30061</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -41013,7 +41021,7 @@
                 </e>
                 <e>
                     <k>event_type</k>
-                    <v>21380</v>
+                    <v>21379</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -41027,7 +41035,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>70696</v>
+                                    <v>70695</v>
                                 </b>
                             </bs>
                         </hist>
@@ -41043,7 +41051,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>70696</v>
+                                    <v>70695</v>
                                 </b>
                             </bs>
                         </hist>
@@ -41059,7 +41067,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>70696</v>
+                                    <v>70695</v>
                                 </b>
                             </bs>
                         </hist>
@@ -41075,7 +41083,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16478</v>
+                                    <v>16477</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -41116,7 +41124,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16478</v>
+                                    <v>16477</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -41157,7 +41165,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19815</v>
+                                    <v>19814</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -41265,7 +41273,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30121</v>
+                                    <v>30120</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -41296,7 +41304,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4341</v>
+                                    <v>4340</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -41378,15 +41386,15 @@
         </relation>
         <relation>
             <name>cil_local_variable</name>
-            <cardinality>23026507</cardinality>
+            <cardinality>23026292</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>23026507</v>
+                    <v>23026292</v>
                 </e>
                 <e>
                     <k>impl</k>
-                    <v>6649736</v>
+                    <v>6649674</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -41394,7 +41402,7 @@
                 </e>
                 <e>
                     <k>var_type</k>
-                    <v>2957964</v>
+                    <v>2957937</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -41408,7 +41416,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>23026507</v>
+                                    <v>23026292</v>
                                 </b>
                             </bs>
                         </hist>
@@ -41424,7 +41432,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>23026507</v>
+                                    <v>23026292</v>
                                 </b>
                             </bs>
                         </hist>
@@ -41440,7 +41448,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>23026507</v>
+                                    <v>23026292</v>
                                 </b>
                             </bs>
                         </hist>
@@ -41456,37 +41464,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2714986</v>
+                                    <v>2714961</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1154972</v>
+                                    <v>1154961</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>783477</v>
+                                    <v>783469</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>524995</v>
+                                    <v>524990</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>385197</v>
+                                    <v>385193</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>558778</v>
+                                    <v>558773</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>29</b>
-                                    <v>498801</v>
+                                    <v>498797</v>
                                 </b>
                                 <b>
                                     <a>29</a>
@@ -41507,37 +41515,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2714986</v>
+                                    <v>2714961</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1154972</v>
+                                    <v>1154961</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>783477</v>
+                                    <v>783469</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>524995</v>
+                                    <v>524990</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>385197</v>
+                                    <v>385193</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>558778</v>
+                                    <v>558773</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>29</b>
-                                    <v>498801</v>
+                                    <v>498797</v>
                                 </b>
                                 <b>
                                     <a>29</a>
@@ -41558,37 +41566,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2973084</v>
+                                    <v>2973056</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1271618</v>
+                                    <v>1271606</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>818854</v>
+                                    <v>818847</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>500130</v>
+                                    <v>500126</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>537339</v>
+                                    <v>537334</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>16</b>
-                                    <v>498831</v>
+                                    <v>498826</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>163</b>
-                                    <v>49877</v>
+                                    <v>49876</v>
                                 </b>
                             </bs>
                         </hist>
@@ -41762,27 +41770,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1877350</v>
+                                    <v>1877333</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>375954</v>
+                                    <v>375950</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>175411</v>
+                                    <v>175410</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>232849</v>
+                                    <v>232846</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>29</b>
-                                    <v>223664</v>
+                                    <v>223662</v>
                                 </b>
                                 <b>
                                     <a>29</a>
@@ -41803,27 +41811,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1959652</v>
+                                    <v>1959634</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>358679</v>
+                                    <v>358675</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>267754</v>
+                                    <v>267751</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>12</b>
-                                    <v>222070</v>
+                                    <v>222068</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>44190</b>
-                                    <v>149808</v>
+                                    <v>149807</v>
                                 </b>
                             </bs>
                         </hist>
@@ -41839,27 +41847,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2018536</v>
+                                    <v>2018517</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>391103</v>
+                                    <v>391099</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>185275</v>
+                                    <v>185273</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>239434</v>
+                                    <v>239432</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>217</b>
-                                    <v>123615</v>
+                                    <v>123614</v>
                                 </b>
                             </bs>
                         </hist>
@@ -41869,11 +41877,11 @@
         </relation>
         <relation>
             <name>cil_function_pointer_calling_conventions</name>
-            <cardinality>39912</cardinality>
+            <cardinality>39911</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>39912</v>
+                    <v>39911</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -41891,7 +41899,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39912</v>
+                                    <v>39911</v>
                                 </b>
                             </bs>
                         </hist>
@@ -41922,15 +41930,15 @@
         </relation>
         <relation>
             <name>cil_handler</name>
-            <cardinality>2378514</cardinality>
+            <cardinality>2378492</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2378514</v>
+                    <v>2378492</v>
                 </e>
                 <e>
                     <k>impl</k>
-                    <v>1552395</v>
+                    <v>1552381</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -41942,15 +41950,15 @@
                 </e>
                 <e>
                     <k>try_start</k>
-                    <v>2323145</v>
+                    <v>2323123</v>
                 </e>
                 <e>
                     <k>try_end</k>
-                    <v>2349486</v>
+                    <v>2349464</v>
                 </e>
                 <e>
                     <k>handler_start</k>
-                    <v>2378514</v>
+                    <v>2378492</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -41964,7 +41972,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2378514</v>
+                                    <v>2378492</v>
                                 </b>
                             </bs>
                         </hist>
@@ -41980,7 +41988,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2378514</v>
+                                    <v>2378492</v>
                                 </b>
                             </bs>
                         </hist>
@@ -41996,7 +42004,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2378514</v>
+                                    <v>2378492</v>
                                 </b>
                             </bs>
                         </hist>
@@ -42012,7 +42020,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2378514</v>
+                                    <v>2378492</v>
                                 </b>
                             </bs>
                         </hist>
@@ -42028,7 +42036,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2378514</v>
+                                    <v>2378492</v>
                                 </b>
                             </bs>
                         </hist>
@@ -42044,7 +42052,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2378514</v>
+                                    <v>2378492</v>
                                 </b>
                             </bs>
                         </hist>
@@ -42060,22 +42068,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1142805</v>
+                                    <v>1142795</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>247407</v>
+                                    <v>247405</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>119658</v>
+                                    <v>119656</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>83</b>
-                                    <v>42524</v>
+                                    <v>42523</v>
                                 </b>
                             </bs>
                         </hist>
@@ -42091,22 +42099,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1142805</v>
+                                    <v>1142795</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>247407</v>
+                                    <v>247405</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>119658</v>
+                                    <v>119656</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>83</b>
-                                    <v>42524</v>
+                                    <v>42523</v>
                                 </b>
                             </bs>
                         </hist>
@@ -42122,12 +42130,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1453556</v>
+                                    <v>1453543</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>98839</v>
+                                    <v>98838</v>
                                 </b>
                             </bs>
                         </hist>
@@ -42143,17 +42151,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1161321</v>
+                                    <v>1161310</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>240615</v>
+                                    <v>240613</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>125918</v>
+                                    <v>125917</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -42174,22 +42182,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1153171</v>
+                                    <v>1153160</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>244070</v>
+                                    <v>244068</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>128989</v>
+                                    <v>128988</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>83</b>
-                                    <v>26164</v>
+                                    <v>26163</v>
                                 </b>
                             </bs>
                         </hist>
@@ -42205,22 +42213,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1142805</v>
+                                    <v>1142795</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>247407</v>
+                                    <v>247405</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>119658</v>
+                                    <v>119656</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>83</b>
-                                    <v>42524</v>
+                                    <v>42523</v>
                                 </b>
                             </bs>
                         </hist>
@@ -42758,12 +42766,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2279616</v>
+                                    <v>2279595</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>9</b>
-                                    <v>43528</v>
+                                    <v>43527</v>
                                 </b>
                             </bs>
                         </hist>
@@ -42779,7 +42787,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2323145</v>
+                                    <v>2323123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -42795,12 +42803,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2279616</v>
+                                    <v>2279595</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>9</b>
-                                    <v>43528</v>
+                                    <v>43527</v>
                                 </b>
                             </bs>
                         </hist>
@@ -42816,7 +42824,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2305987</v>
+                                    <v>2305966</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -42837,7 +42845,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2299727</v>
+                                    <v>2299705</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -42858,12 +42866,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2279616</v>
+                                    <v>2279595</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>9</b>
-                                    <v>43528</v>
+                                    <v>43527</v>
                                 </b>
                             </bs>
                         </hist>
@@ -42879,7 +42887,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2326836</v>
+                                    <v>2326814</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -42900,7 +42908,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2349486</v>
+                                    <v>2349464</v>
                                 </b>
                             </bs>
                         </hist>
@@ -42916,7 +42924,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2326836</v>
+                                    <v>2326814</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -42937,7 +42945,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2347537</v>
+                                    <v>2347515</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -42958,7 +42966,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2349486</v>
+                                    <v>2349464</v>
                                 </b>
                             </bs>
                         </hist>
@@ -42974,7 +42982,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2326836</v>
+                                    <v>2326814</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -42995,7 +43003,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2378514</v>
+                                    <v>2378492</v>
                                 </b>
                             </bs>
                         </hist>
@@ -43011,7 +43019,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2378514</v>
+                                    <v>2378492</v>
                                 </b>
                             </bs>
                         </hist>
@@ -43027,7 +43035,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2378514</v>
+                                    <v>2378492</v>
                                 </b>
                             </bs>
                         </hist>
@@ -43043,7 +43051,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2378514</v>
+                                    <v>2378492</v>
                                 </b>
                             </bs>
                         </hist>
@@ -43059,7 +43067,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2378514</v>
+                                    <v>2378492</v>
                                 </b>
                             </bs>
                         </hist>
@@ -43075,7 +43083,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2378514</v>
+                                    <v>2378492</v>
                                 </b>
                             </bs>
                         </hist>
@@ -43133,11 +43141,11 @@
         </relation>
         <relation>
             <name>cil_handler_type</name>
-            <cardinality>400819</cardinality>
+            <cardinality>400815</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>400819</v>
+                    <v>400815</v>
                 </e>
                 <e>
                     <k>catch_type</k>
@@ -43155,7 +43163,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>400819</v>
+                                    <v>400815</v>
                                 </b>
                             </bs>
                         </hist>
@@ -43216,11 +43224,11 @@
         </relation>
         <relation>
             <name>cil_method_stack_size</name>
-            <cardinality>27072292</cardinality>
+            <cardinality>27072039</cardinality>
             <columnsizes>
                 <e>
                     <k>method</k>
-                    <v>27072292</v>
+                    <v>27072039</v>
                 </e>
                 <e>
                     <k>size</k>
@@ -43238,7 +43246,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27072292</v>
+                                    <v>27072039</v>
                                 </b>
                             </bs>
                         </hist>
@@ -43309,121 +43317,121 @@
         </relation>
         <relation>
             <name>cil_public</name>
-            <cardinality>30557526</cardinality>
+            <cardinality>30557240</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>30557526</v>
+                    <v>30557240</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>cil_private</name>
-            <cardinality>15498766</cardinality>
+            <cardinality>15498621</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>15498766</v>
+                    <v>15498621</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>cil_protected</name>
-            <cardinality>28744228</cardinality>
+            <cardinality>28743959</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>28744228</v>
+                    <v>28743959</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>cil_internal</name>
-            <cardinality>986884</cardinality>
+            <cardinality>986874</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>986884</v>
+                    <v>986874</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>cil_static</name>
-            <cardinality>14521686</cardinality>
+            <cardinality>14521550</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>14521686</v>
+                    <v>14521550</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>cil_sealed</name>
-            <cardinality>6359922</cardinality>
+            <cardinality>6359863</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6359922</v>
+                    <v>6359863</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>cil_virtual</name>
-            <cardinality>11734704</cardinality>
+            <cardinality>11734594</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>11734704</v>
+                    <v>11734594</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>cil_abstract</name>
-            <cardinality>2826199</cardinality>
+            <cardinality>2826172</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2826199</v>
+                    <v>2826172</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>cil_class</name>
-            <cardinality>4475041</cardinality>
+            <cardinality>4475000</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4475041</v>
+                    <v>4475000</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>cil_interface</name>
-            <cardinality>367479</cardinality>
+            <cardinality>367475</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>367479</v>
+                    <v>367475</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>cil_security</name>
-            <cardinality>48814</cardinality>
+            <cardinality>48813</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>48814</v>
+                    <v>48813</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -43441,37 +43449,37 @@
         </relation>
         <relation>
             <name>cil_specialname</name>
-            <cardinality>12520543</cardinality>
+            <cardinality>12520426</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12520543</v>
+                    <v>12520426</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>cil_newslot</name>
-            <cardinality>7370933</cardinality>
+            <cardinality>7370864</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7370933</v>
+                    <v>7370864</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>cil_base_class</name>
-            <cardinality>4460424</cardinality>
+            <cardinality>4460382</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4460424</v>
+                    <v>4460382</v>
                 </e>
                 <e>
                     <k>base</k>
-                    <v>462242</v>
+                    <v>462238</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -43485,7 +43493,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4460424</v>
+                                    <v>4460382</v>
                                 </b>
                             </bs>
                         </hist>
@@ -43501,12 +43509,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>280600</v>
+                                    <v>280597</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>90068</v>
+                                    <v>90067</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -43516,7 +43524,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>38242</v>
+                                    <v>38241</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -43531,15 +43539,15 @@
         </relation>
         <relation>
             <name>cil_base_interface</name>
-            <cardinality>2925894</cardinality>
+            <cardinality>2925867</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1244479</v>
+                    <v>1244468</v>
                 </e>
                 <e>
                     <k>base</k>
-                    <v>538638</v>
+                    <v>538633</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -43553,32 +43561,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>703478</v>
+                                    <v>703472</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>199095</v>
+                                    <v>199093</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>95531</v>
+                                    <v>95530</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>46540</v>
+                                    <v>46539</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>123792</v>
+                                    <v>123791</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>32</b>
-                                    <v>76041</v>
+                                    <v>76040</v>
                                 </b>
                             </bs>
                         </hist>
@@ -43594,7 +43602,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>358649</v>
+                                    <v>358646</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -43604,12 +43612,12 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>31834</v>
+                                    <v>31833</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>43203</v>
+                                    <v>43202</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -43629,11 +43637,11 @@
         </relation>
         <relation>
             <name>cil_enum_underlying_type</name>
-            <cardinality>203849</cardinality>
+            <cardinality>203848</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>203849</v>
+                    <v>203848</v>
                 </e>
                 <e>
                     <k>underlying</k>
@@ -43651,7 +43659,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>203849</v>
+                                    <v>203848</v>
                                 </b>
                             </bs>
                         </hist>
@@ -43712,11 +43720,11 @@
         </relation>
         <relation>
             <name>cil_type_parameter</name>
-            <cardinality>1773609</cardinality>
+            <cardinality>1773592</cardinality>
             <columnsizes>
                 <e>
                     <k>unbound</k>
-                    <v>1331358</v>
+                    <v>1331346</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -43724,7 +43732,7 @@
                 </e>
                 <e>
                     <k>param</k>
-                    <v>1773609</v>
+                    <v>1773592</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -43738,17 +43746,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>994443</v>
+                                    <v>994434</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>282460</v>
+                                    <v>282457</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>43</b>
-                                    <v>54454</v>
+                                    <v>54453</v>
                                 </b>
                             </bs>
                         </hist>
@@ -43764,17 +43772,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>994443</v>
+                                    <v>994434</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>282460</v>
+                                    <v>282457</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>43</b>
-                                    <v>54454</v>
+                                    <v>54453</v>
                                 </b>
                             </bs>
                         </hist>
@@ -43912,7 +43920,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1773609</v>
+                                    <v>1773592</v>
                                 </b>
                             </bs>
                         </hist>
@@ -43928,7 +43936,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1773609</v>
+                                    <v>1773592</v>
                                 </b>
                             </bs>
                         </hist>
@@ -43938,11 +43946,11 @@
         </relation>
         <relation>
             <name>cil_type_argument</name>
-            <cardinality>11206076</cardinality>
+            <cardinality>11205971</cardinality>
             <columnsizes>
                 <e>
                     <k>bound</k>
-                    <v>8383213</v>
+                    <v>8383135</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -43950,7 +43958,7 @@
                 </e>
                 <e>
                     <k>t</k>
-                    <v>2800094</v>
+                    <v>2800068</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -43964,17 +43972,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5919148</v>
+                                    <v>5919093</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2202955</v>
+                                    <v>2202934</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>43</b>
-                                    <v>261109</v>
+                                    <v>261107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -43990,17 +43998,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6030449</v>
+                                    <v>6030393</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2159013</v>
+                                    <v>2158993</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>43</b>
-                                    <v>193750</v>
+                                    <v>193748</v>
                                 </b>
                             </bs>
                         </hist>
@@ -44133,32 +44141,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1210194</v>
+                                    <v>1210183</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>732418</v>
+                                    <v>732411</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>295483</v>
+                                    <v>295480</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>237455</v>
+                                    <v>237453</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>12</b>
-                                    <v>215160</v>
+                                    <v>215158</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>14769</b>
-                                    <v>109381</v>
+                                    <v>109380</v>
                                 </b>
                             </bs>
                         </hist>
@@ -44174,17 +44182,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2254043</v>
+                                    <v>2254022</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>502079</v>
+                                    <v>502075</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>10</b>
-                                    <v>43971</v>
+                                    <v>43970</v>
                                 </b>
                             </bs>
                         </hist>
@@ -44285,19 +44293,19 @@
         </relation>
         <relation>
             <name>cil_attribute</name>
-            <cardinality>5874527</cardinality>
+            <cardinality>5874473</cardinality>
             <columnsizes>
                 <e>
                     <k>attributeid</k>
-                    <v>5874527</v>
+                    <v>5874473</v>
                 </e>
                 <e>
                     <k>element</k>
-                    <v>5184131</v>
+                    <v>5184082</v>
                 </e>
                 <e>
                     <k>constructor</k>
-                    <v>27995</v>
+                    <v>27994</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -44311,7 +44319,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5874527</v>
+                                    <v>5874473</v>
                                 </b>
                             </bs>
                         </hist>
@@ -44327,7 +44335,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5874527</v>
+                                    <v>5874473</v>
                                 </b>
                             </bs>
                         </hist>
@@ -44343,12 +44351,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4807940</v>
+                                    <v>4807895</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3520</b>
-                                    <v>376190</v>
+                                    <v>376187</v>
                                 </b>
                             </bs>
                         </hist>
@@ -44364,12 +44372,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4812458</v>
+                                    <v>4812413</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>9</b>
-                                    <v>371672</v>
+                                    <v>371669</v>
                                 </b>
                             </bs>
                         </hist>
@@ -44521,11 +44529,11 @@
         </relation>
         <relation>
             <name>cil_attribute_named_argument</name>
-            <cardinality>261818</cardinality>
+            <cardinality>261816</cardinality>
             <columnsizes>
                 <e>
                     <k>attribute_id</k>
-                    <v>161089</v>
+                    <v>161088</v>
                 </e>
                 <e>
                     <k>param</k>
@@ -44533,7 +44541,7 @@
                 </e>
                 <e>
                     <k>value</k>
-                    <v>119569</v>
+                    <v>119568</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -44547,7 +44555,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>97510</v>
+                                    <v>97509</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -44562,7 +44570,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>12137</v>
+                                    <v>12136</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -44583,7 +44591,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>103711</v>
+                                    <v>103710</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -44746,7 +44754,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>101171</v>
+                                    <v>101170</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -44772,7 +44780,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>112925</v>
+                                    <v>112924</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -44787,11 +44795,11 @@
         </relation>
         <relation>
             <name>cil_attribute_positional_argument</name>
-            <cardinality>1757367</cardinality>
+            <cardinality>1757351</cardinality>
             <columnsizes>
                 <e>
                     <k>attribute_id</k>
-                    <v>1528150</v>
+                    <v>1528136</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -44799,7 +44807,7 @@
                 </e>
                 <e>
                     <k>value</k>
-                    <v>440478</v>
+                    <v>440474</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -44813,12 +44821,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1317006</v>
+                                    <v>1316994</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>194104</v>
+                                    <v>194103</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -44839,12 +44847,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1318276</v>
+                                    <v>1318264</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>194222</v>
+                                    <v>194221</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -44932,12 +44940,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>324925</v>
+                                    <v>324922</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>75273</v>
+                                    <v>75272</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -44963,7 +44971,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>400848</v>
+                                    <v>400845</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -44983,19 +44991,19 @@
         </relation>
         <relation>
             <name>metadata_handle</name>
-            <cardinality>109731032</cardinality>
+            <cardinality>109730006</cardinality>
             <columnsizes>
                 <e>
                     <k>entity</k>
-                    <v>109393999</v>
+                    <v>109392976</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>14588</v>
+                    <v>14587</v>
                 </e>
                 <e>
                     <k>handle</k>
-                    <v>2756447</v>
+                    <v>2756422</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -45009,12 +45017,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>109222337</v>
+                                    <v>109221316</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>495</b>
-                                    <v>171661</v>
+                                    <v>171659</v>
                                 </b>
                             </bs>
                         </hist>
@@ -45030,12 +45038,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>109225527</v>
+                                    <v>109224505</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>104</b>
-                                    <v>168472</v>
+                                    <v>168470</v>
                                 </b>
                             </bs>
                         </hist>
@@ -45198,7 +45206,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>373149</v>
+                                    <v>373145</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -45208,57 +45216,57 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>360687</v>
+                                    <v>360683</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>210051</v>
+                                    <v>210049</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>237367</v>
+                                    <v>237364</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>15</b>
-                                    <v>233026</v>
+                                    <v>233024</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>22</b>
-                                    <v>101939</v>
+                                    <v>101938</v>
                                 </b>
                                 <b>
                                     <a>22</a>
                                     <b>25</b>
-                                    <v>223103</v>
+                                    <v>223101</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>39</b>
-                                    <v>216105</v>
+                                    <v>216103</v>
                                 </b>
                                 <b>
                                     <a>39</a>
                                     <b>51</b>
-                                    <v>211143</v>
+                                    <v>211142</v>
                                 </b>
                                 <b>
                                     <a>51</a>
                                     <b>73</b>
-                                    <v>210317</v>
+                                    <v>210315</v>
                                 </b>
                                 <b>
                                     <a>73</a>
                                     <b>137</b>
-                                    <v>207807</v>
+                                    <v>207805</v>
                                 </b>
                                 <b>
                                     <a>137</a>
                                     <b>732</b>
-                                    <v>169801</v>
+                                    <v>169799</v>
                                 </b>
                             </bs>
                         </hist>
@@ -45274,62 +45282,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>373651</v>
+                                    <v>373647</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>362134</v>
+                                    <v>362130</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>205326</v>
+                                    <v>205324</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>242092</v>
+                                    <v>242089</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>233026</v>
+                                    <v>233024</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>101733</v>
+                                    <v>101732</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>13</b>
-                                    <v>223192</v>
+                                    <v>223190</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>20</b>
-                                    <v>216134</v>
+                                    <v>216132</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>26</b>
-                                    <v>210523</v>
+                                    <v>210521</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>37</b>
-                                    <v>210996</v>
+                                    <v>210994</v>
                                 </b>
                                 <b>
                                     <a>37</a>
                                     <b>70</b>
-                                    <v>209903</v>
+                                    <v>209901</v>
                                 </b>
                                 <b>
                                     <a>70</a>
                                     <b>495</b>
-                                    <v>167733</v>
+                                    <v>167732</v>
                                 </b>
                             </bs>
                         </hist>
diff --git a/csharp/ql/lib/upgrades/83aca6b3e4fa38dd2b97b9b51dfc199a2ba9c7f2/old.dbscheme b/csharp/ql/lib/upgrades/83aca6b3e4fa38dd2b97b9b51dfc199a2ba9c7f2/old.dbscheme
new file mode 100644
index 00000000000..83aca6b3e4f
--- /dev/null
+++ b/csharp/ql/lib/upgrades/83aca6b3e4fa38dd2b97b9b51dfc199a2ba9c7f2/old.dbscheme
@@ -0,0 +1,2067 @@
+/* This is a dummy line to alter the dbscheme, so we can make a database upgrade
+ * without actually changing any of the dbscheme predicates. It contains a date
+ * to allow for such updates in the future as well.
+ *
+ * 2021-07-14
+ *
+ * DO NOT remove this comment carelessly, since it can revert the dbscheme back to a
+ * previously seen state (matching a previously seen SHA), which would make the upgrade
+ * mechanism not work properly.
+ */
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    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
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | --compiler
+ * 1   | *path to compiler*
+ * 2   | f1.cs
+ * 3   | f2.cs
+ * 4   | f3.cs
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.cs
+ * 1   | f2.cs
+ * 2   | f3.cs
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The references used by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs /r:ref1.dll /r:ref2.dll /r:ref3.dll
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | ref1.dll
+ * 1   | ref2.dll
+ * 2   | ref3.dll
+ */
+#keyset[id, num]
+compilation_referencing_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(
+    unique int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location_default ref
+);
+
+extractor_messages(
+    unique int id: @extractor_message,
+    int severity: int ref,
+    string origin : string ref,
+    string text : string ref,
+    string entity : string ref,
+    int location: @location_default ref,
+    string stack_trace : string 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
+);
+
+compilation_assembly(
+  unique int id : @compilation ref,
+  int assembly: @assembly ref
+)
+
+// Populated by the CSV extractor
+externalData(
+   int id: @externalDataElement,
+   string path: string ref,
+   int column: int ref,
+   string value: string ref);
+
+sourceLocationPrefix(
+  string prefix: string ref);
+
+/*
+ * C# dbscheme
+ */
+
+/** ELEMENTS **/
+
+@element = @declaration | @stmt | @expr | @modifier | @attribute | @namespace_declaration
+         | @using_directive | @type_parameter_constraints | @externalDataElement
+         | @xmllocatable | @asp_element | @namespace | @preprocessor_directive;
+
+@declaration = @callable | @generic | @assignable | @namespace;
+
+@named_element = @namespace | @declaration;
+
+@declaration_with_accessors = @property | @indexer | @event;
+
+@assignable = @variable | @assignable_with_accessors | @event;
+
+@assignable_with_accessors = @property | @indexer;
+
+@attributable = @assembly | @field | @parameter | @operator | @method | @constructor
+              | @destructor | @callable_accessor | @value_or_ref_type | @declaration_with_accessors
+              | @local_function | @lambda_expr;
+
+/** LOCATIONS, ASEMMBLIES, MODULES, FILES and FOLDERS **/
+
+@location = @location_default | @assembly;
+
+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);
+
+locations_mapped(
+  unique int id: @location_default ref,
+  int mapped_to: @location_default ref);
+
+@sourceline = @file | @callable | @xmllocatable;
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref);
+
+assemblies(
+  unique int id: @assembly,
+  int file: @file ref,
+  string fullname: string ref,
+  string name: string ref,
+  string version: string ref);
+
+files(
+  unique int id: @file,
+  string name: string ref);
+
+folders(
+  unique int id: @folder,
+  string name: string ref);
+
+@container = @folder | @file ;
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref);
+
+file_extraction_mode(
+  unique int file: @file ref,
+  int mode: int ref
+  /* 0 = normal, 1 = standalone extractor */
+  );
+
+/** NAMESPACES **/
+
+@type_container = @namespace | @type;
+
+namespaces(
+  unique int id: @namespace,
+  string name: string ref);
+
+namespace_declarations(
+  unique int id: @namespace_declaration,
+  int namespace_id: @namespace ref);
+
+namespace_declaration_location(
+  unique int id: @namespace_declaration ref,
+  int loc: @location ref);
+
+parent_namespace(
+  unique int child_id: @type_container ref,
+  int namespace_id: @namespace ref);
+
+@declaration_or_directive = @namespace_declaration | @type | @using_directive;
+
+parent_namespace_declaration(
+  int child_id: @declaration_or_directive ref, // cannot be unique because of partial classes
+  int namespace_id: @namespace_declaration ref);
+
+@using_directive = @using_namespace_directive | @using_static_directive;
+
+using_global(
+  unique int id: @using_directive ref
+);
+
+using_namespace_directives(
+  unique int id: @using_namespace_directive,
+  int namespace_id: @namespace ref);
+
+using_static_directives(
+  unique int id: @using_static_directive,
+  int type_id: @type_or_ref ref);
+
+using_directive_location(
+  unique int id: @using_directive ref,
+  int loc: @location ref);
+
+@preprocessor_directive = @pragma_warning | @pragma_checksum | @directive_define | @directive_undefine | @directive_warning
+  | @directive_error | @directive_nullable | @directive_line | @directive_region | @directive_endregion | @directive_if
+  | @directive_elif | @directive_else | @directive_endif;
+
+@conditional_directive = @directive_if | @directive_elif;
+@branch_directive = @directive_if | @directive_elif | @directive_else;
+
+directive_ifs(
+  unique int id: @directive_if,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref); /* 0: false, 1: true */
+
+directive_elifs(
+  unique int id: @directive_elif,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref,  /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+directive_elses(
+  unique int id: @directive_else,
+  int branchTaken: int ref,   /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+#keyset[id, start]
+directive_endifs(
+  unique int id: @directive_endif,
+  unique int start: @directive_if ref);
+
+directive_define_symbols(
+  unique int id: @define_symbol_expr ref,
+  string name: string ref);
+
+directive_regions(
+  unique int id: @directive_region,
+  string name: string ref);
+
+#keyset[id, start]
+directive_endregions(
+  unique int id: @directive_endregion,
+  unique int start: @directive_region ref);
+
+directive_lines(
+  unique int id: @directive_line,
+  int kind: int ref); /* 0: default, 1: hidden, 2: numeric, 3: span */
+
+directive_line_value(
+  unique int id: @directive_line ref,
+  int line: int ref);
+
+directive_line_file(
+  unique int id: @directive_line ref,
+  int file: @file ref);
+
+directive_line_offset(
+  unique int id: @directive_line ref,
+  int offset: int ref);
+
+directive_line_span(
+  unique int id: @directive_line ref,
+  int startLine: int ref,
+  int startColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref);
+
+directive_nullables(
+  unique int id: @directive_nullable,
+  int setting: int ref, /* 0: disable, 1: enable, 2: restore */
+  int target: int ref); /* 0: none, 1: annotations, 2: warnings */
+
+directive_warnings(
+  unique int id: @directive_warning,
+  string message: string ref);
+
+directive_errors(
+  unique int id: @directive_error,
+  string message: string ref);
+
+directive_undefines(
+  unique int id: @directive_undefine,
+  string name: string ref);
+
+directive_defines(
+  unique int id: @directive_define,
+  string name: string ref);
+
+pragma_checksums(
+  unique int id: @pragma_checksum,
+  int file: @file ref,
+  string guid: string ref,
+  string bytes: string ref);
+
+pragma_warnings(
+  unique int id: @pragma_warning,
+  int kind: int ref /* 0 = disable, 1 = restore */);
+
+#keyset[id, index]
+pragma_warning_error_codes(
+  int id: @pragma_warning ref,
+  string errorCode: string ref,
+  int index: int ref);
+
+preprocessor_directive_location(
+  unique int id: @preprocessor_directive ref,
+  int loc: @location ref);
+
+preprocessor_directive_compilation(
+  unique int id: @preprocessor_directive ref,
+  int compilation: @compilation ref);
+
+preprocessor_directive_active(
+  unique int id: @preprocessor_directive ref,
+  int active: int ref);  /* 0: false, 1: true */
+
+/** TYPES **/
+
+types(
+  unique int id: @type,
+  int kind: int ref,
+  string name: string ref);
+
+case @type.kind of
+   1 = @bool_type
+|  2 = @char_type
+|  3 = @decimal_type
+|  4 = @sbyte_type
+|  5 = @short_type
+|  6 = @int_type
+|  7 = @long_type
+|  8 = @byte_type
+|  9 = @ushort_type
+| 10 = @uint_type
+| 11 = @ulong_type
+| 12 = @float_type
+| 13 = @double_type
+| 14 = @enum_type
+| 15 = @struct_type
+| 17 = @class_type
+| 19 = @interface_type
+| 20 = @delegate_type
+| 21 = @null_type
+| 22 = @type_parameter
+| 23 = @pointer_type
+| 24 = @nullable_type
+| 25 = @array_type
+| 26 = @void_type
+| 27 = @int_ptr_type
+| 28 = @uint_ptr_type
+| 29 = @dynamic_type
+| 30 = @arglist_type
+| 31 = @unknown_type
+| 32 = @tuple_type
+| 33 = @function_pointer_type
+  ;
+
+@simple_type = @bool_type | @char_type | @integral_type | @floating_point_type | @decimal_type;
+@integral_type = @signed_integral_type | @unsigned_integral_type;
+@signed_integral_type = @sbyte_type | @short_type | @int_type | @long_type;
+@unsigned_integral_type = @byte_type  | @ushort_type | @uint_type | @ulong_type;
+@floating_point_type = @float_type | @double_type;
+@value_type = @simple_type | @enum_type | @struct_type | @nullable_type | @int_ptr_type
+            | @uint_ptr_type | @tuple_type;
+@ref_type = @class_type | @interface_type | @array_type | @delegate_type | @null_type
+          | @dynamic_type;
+@value_or_ref_type = @value_type | @ref_type;
+
+typerefs(
+  unique int id: @typeref,
+  string name: string ref);
+
+typeref_type(
+  int id: @typeref ref,
+  unique int typeId: @type ref);
+
+@type_or_ref = @type | @typeref;
+
+array_element_type(
+  unique int array: @array_type ref,
+  int dimension: int ref,
+  int rank: int ref,
+  int element: @type_or_ref ref);
+
+nullable_underlying_type(
+  unique int nullable: @nullable_type ref,
+  int underlying: @type_or_ref ref);
+
+pointer_referent_type(
+  unique int pointer: @pointer_type ref,
+  int referent: @type_or_ref ref);
+
+enum_underlying_type(
+  unique int enum_id: @enum_type ref,
+  int underlying_type_id: @type_or_ref ref);
+
+delegate_return_type(
+  unique int delegate_id: @delegate_type ref,
+  int return_type_id: @type_or_ref ref);
+
+function_pointer_return_type(
+    unique int function_pointer_id: @function_pointer_type ref,
+    int return_type_id: @type_or_ref ref);
+
+extend(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+anonymous_types(
+  unique int id: @type ref);
+
+@interface_or_ref = @interface_type | @typeref;
+
+implement(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+type_location(
+  int id: @type ref,
+  int loc: @location ref);
+
+tuple_underlying_type(
+  unique int tuple: @tuple_type ref,
+  int struct: @type_or_ref ref);
+
+#keyset[tuple, index]
+tuple_element(
+  int tuple: @tuple_type ref,
+  int index: int ref,
+  unique int field: @field ref);
+
+attributes(
+  unique int id: @attribute,
+  int kind: int ref,
+  int type_id: @type_or_ref ref,
+  int target:  @attributable ref);
+
+case @attribute.kind of
+  0 = @attribute_default
+| 1 = @attribute_return
+| 2 = @attribute_assembly
+| 3 = @attribute_module
+;
+
+attribute_location(
+  int id: @attribute ref,
+  int loc: @location ref);
+
+@type_mention_parent = @element | @type_mention;
+
+type_mention(
+  unique int id: @type_mention,
+  int type_id: @type_or_ref ref,
+  int parent: @type_mention_parent ref);
+
+type_mention_location(
+  unique int id: @type_mention ref,
+  int loc: @location ref);
+
+@has_type_annotation = @assignable | @type_parameter | @callable | @expr | @delegate_type | @generic | @function_pointer_type;
+
+/**
+ * A direct annotation on an entity, for example `string? x;`.
+ *
+ * Annotations:
+ * 2 = reftype is not annotated "!"
+ * 3 = reftype is annotated "?"
+ * 4 = readonly ref type / in parameter
+ * 5 = ref type parameter, return or local variable
+ * 6 = out parameter
+ *
+ * Note that the annotation depends on the element it annotates.
+ * @assignable: The annotation is on the type of the assignable, for example the variable type.
+ * @type_parameter: The annotation is on the reftype constraint
+ * @callable: The annotation is on the return type
+ * @array_type: The annotation is on the element type
+ */
+type_annotation(int id: @has_type_annotation ref, int annotation: int ref);
+
+nullability(unique int nullability: @nullability, int kind: int ref);
+
+case @nullability.kind of
+  0 = @oblivious
+| 1 = @not_annotated
+| 2 = @annotated
+;
+
+#keyset[parent, index]
+nullability_parent(int nullability: @nullability ref, int index: int ref, int parent: @nullability ref)
+
+type_nullability(int id: @has_type_annotation ref, int nullability: @nullability ref);
+
+/**
+ * The nullable flow state of an expression, as determined by Roslyn.
+ *   0 = none (default, not populated)
+ *   1 = not null
+ *   2 = maybe null
+ */
+expr_flowstate(unique int id: @expr ref, int state: int ref);
+
+/** GENERICS **/
+
+@generic = @type | @method | @local_function;
+
+type_parameters(
+  unique int id: @type_parameter ref,
+  int index: int ref,
+  int generic_id: @generic ref,
+  int variance: int ref /* none = 0, out = 1, in = 2 */);
+
+#keyset[constructed_id, index]
+type_arguments(
+  int id: @type_or_ref ref,
+  int index: int ref,
+  int constructed_id: @generic_or_ref ref);
+
+@generic_or_ref = @generic | @typeref;
+
+constructed_generic(
+  unique int constructed: @generic ref,
+  int generic: @generic_or_ref ref);
+
+type_parameter_constraints(
+  unique int id: @type_parameter_constraints,
+  int param_id: @type_parameter ref);
+
+type_parameter_constraints_location(
+  int id: @type_parameter_constraints ref,
+  int loc: @location ref);
+
+general_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int kind: int ref /* class = 1, struct = 2, new = 3 */);
+
+specific_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref);
+
+specific_type_parameter_nullability(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref,
+  int nullability: @nullability ref);
+
+/** FUNCTION POINTERS */
+
+function_pointer_calling_conventions(
+  int id: @function_pointer_type ref,
+  int kind: int ref);
+
+#keyset[id, index]
+has_unmanaged_calling_conventions(
+  int id: @function_pointer_type ref,
+  int index: int ref,
+  int conv_id: @type_or_ref ref);
+
+/** MODIFIERS */
+
+@modifiable = @modifiable_direct | @event_accessor;
+
+@modifiable_direct = @member | @accessor | @local_function | @anonymous_function_expr;
+
+modifiers(
+  unique int id: @modifier,
+  string name: string ref);
+
+has_modifiers(
+  int id: @modifiable_direct ref,
+  int mod_id: @modifier ref);
+
+compiler_generated(unique int id: @modifiable ref);
+
+/** MEMBERS **/
+
+@member = @method | @constructor | @destructor | @field | @property | @event | @operator | @indexer | @type;
+
+@named_exprorstmt = @goto_stmt | @labeled_stmt | @expr;
+
+@virtualizable = @method | @property | @indexer | @event;
+
+exprorstmt_name(
+  unique int parent_id: @named_exprorstmt ref,
+  string name: string ref);
+
+nested_types(
+  unique int id: @type ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @type ref);
+
+properties(
+  unique int id: @property,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @property ref);
+
+property_location(
+  int id: @property ref,
+  int loc: @location ref);
+
+indexers(
+  unique int id: @indexer,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @indexer ref);
+
+indexer_location(
+  int id: @indexer ref,
+  int loc: @location ref);
+
+accessors(
+  unique int id: @accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_member_id: @member ref,
+  int unbound_id: @accessor ref);
+
+case @accessor.kind of
+  1 = @getter
+| 2 = @setter
+  ;
+
+init_only_accessors(
+  unique int id: @accessor ref);
+
+accessor_location(
+  int id: @accessor ref,
+  int loc: @location ref);
+
+events(
+  unique int id: @event,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @event ref);
+
+event_location(
+  int id: @event ref,
+  int loc: @location ref);
+
+event_accessors(
+  unique int id: @event_accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_event_id: @event ref,
+  int unbound_id: @event_accessor ref);
+
+case @event_accessor.kind of
+  1 = @add_event_accessor
+| 2 = @remove_event_accessor
+  ;
+
+event_accessor_location(
+  int id: @event_accessor ref,
+  int loc: @location ref);
+
+operators(
+  unique int id: @operator,
+  string name: string ref,
+  string symbol: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @operator ref);
+
+operator_location(
+  int id: @operator ref,
+  int loc: @location ref);
+
+constant_value(
+  int id: @variable ref,
+  string value: string ref);
+
+/** CALLABLES **/
+
+@callable = @method | @constructor | @destructor | @operator | @callable_accessor | @anonymous_function_expr | @local_function;
+
+@callable_accessor = @accessor | @event_accessor;
+
+methods(
+  unique int id: @method,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @method ref);
+
+method_location(
+  int id: @method ref,
+  int loc: @location ref);
+
+constructors(
+  unique int id: @constructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @constructor ref);
+
+constructor_location(
+  int id: @constructor ref,
+  int loc: @location ref);
+
+destructors(
+  unique int id: @destructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @destructor ref);
+
+destructor_location(
+  int id: @destructor ref,
+  int loc: @location ref);
+
+overrides(
+  int id: @callable ref,
+  int base_id: @callable ref);
+
+explicitly_implements(
+  int id: @member ref,
+  int interface_id: @interface_or_ref ref);
+
+local_functions(
+    unique int id: @local_function,
+    string name: string ref,
+    int return_type: @type ref,
+    int unbound_id: @local_function ref);
+
+local_function_stmts(
+    unique int fn: @local_function_stmt ref,
+    int stmt: @local_function ref);
+
+/** VARIABLES **/
+
+@variable = @local_scope_variable | @field;
+
+@local_scope_variable = @local_variable | @parameter;
+
+fields(
+  unique int id: @field,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @field ref);
+
+case @field.kind of
+  1 = @addressable_field
+| 2 = @constant
+  ;
+
+field_location(
+  int id: @field ref,
+  int loc: @location ref);
+
+localvars(
+  unique int id: @local_variable,
+  int kind: int ref,
+  string name: string ref,
+  int implicitly_typed: int ref /* 0 = no, 1 = yes */,
+  int type_id: @type_or_ref ref,
+  int parent_id: @local_var_decl_expr ref);
+
+case @local_variable.kind of
+  1 = @addressable_local_variable
+| 2 = @local_constant
+| 3 = @local_variable_ref
+  ;
+
+localvar_location(
+  unique int id: @local_variable ref,
+  int loc: @location ref);
+
+@parameterizable = @callable | @delegate_type | @indexer | @function_pointer_type;
+
+#keyset[name, parent_id]
+#keyset[index, parent_id]
+params(
+  unique int id: @parameter,
+  string name: string ref,
+  int type_id: @type_or_ref ref,
+  int index: int ref,
+  int mode: int ref, /* value = 0, ref = 1, out = 2, array = 3, this = 4 */
+  int parent_id: @parameterizable ref,
+  int unbound_id: @parameter ref);
+
+param_location(
+  int id: @parameter ref,
+  int loc: @location ref);
+
+/** STATEMENTS **/
+
+@exprorstmt_parent = @control_flow_element | @top_level_exprorstmt_parent;
+
+statements(
+  unique int id: @stmt,
+  int kind: int ref);
+
+#keyset[index, parent]
+stmt_parent(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_stmt_parent = @callable;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+stmt_parent_top_level(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @top_level_stmt_parent ref);
+
+case @stmt.kind of
+   1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @switch_stmt
+|  5 = @while_stmt
+|  6 = @do_stmt
+|  7 = @for_stmt
+|  8 = @foreach_stmt
+|  9 = @break_stmt
+| 10 = @continue_stmt
+| 11 = @goto_stmt
+| 12 = @goto_case_stmt
+| 13 = @goto_default_stmt
+| 14 = @throw_stmt
+| 15 = @return_stmt
+| 16 = @yield_stmt
+| 17 = @try_stmt
+| 18 = @checked_stmt
+| 19 = @unchecked_stmt
+| 20 = @lock_stmt
+| 21 = @using_block_stmt
+| 22 = @var_decl_stmt
+| 23 = @const_decl_stmt
+| 24 = @empty_stmt
+| 25 = @unsafe_stmt
+| 26 = @fixed_stmt
+| 27 = @label_stmt
+| 28 = @catch
+| 29 = @case_stmt
+| 30 = @local_function_stmt
+| 31 = @using_decl_stmt
+  ;
+
+@using_stmt = @using_block_stmt | @using_decl_stmt;
+
+@labeled_stmt = @label_stmt | @case;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @using_decl_stmt;
+
+@cond_stmt = @if_stmt | @switch_stmt;
+
+@loop_stmt = @while_stmt | @do_stmt | @for_stmt | @foreach_stmt;
+
+@jump_stmt = @break_stmt | @goto_any_stmt | @continue_stmt | @throw_stmt | @return_stmt
+           | @yield_stmt;
+
+@goto_any_stmt = @goto_default_stmt | @goto_case_stmt | @goto_stmt;
+
+
+stmt_location(
+  unique int id: @stmt ref,
+  int loc: @location ref);
+
+catch_type(
+  unique int catch_id: @catch ref,
+  int type_id: @type_or_ref ref,
+  int kind: int ref /* explicit = 1, implicit = 2 */);
+
+foreach_stmt_info(
+  unique int id: @foreach_stmt ref,
+  int kind: int ref /* non-async = 1, async = 2 */);
+
+@foreach_symbol =  @method | @property | @type_or_ref;
+
+#keyset[id, kind]
+foreach_stmt_desugar(
+  int id: @foreach_stmt ref,
+  int symbol: @foreach_symbol ref,
+  int kind: int ref /* GetEnumeratorMethod = 1, CurrentProperty = 2, MoveNextMethod = 3, DisposeMethod = 4, ElementType = 5 */);
+
+/** EXPRESSIONS **/
+
+expressions(
+  unique int id: @expr,
+  int kind: int ref,
+  int type_id: @type_or_ref ref);
+
+#keyset[index, parent]
+expr_parent(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_expr_parent = @attribute | @field | @property | @indexer | @parameter | @directive_if | @directive_elif;
+
+@top_level_exprorstmt_parent = @top_level_expr_parent | @top_level_stmt_parent;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+expr_parent_top_level(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @top_level_exprorstmt_parent ref);
+
+case @expr.kind of
+/* literal */
+   1 = @bool_literal_expr
+|  2 = @char_literal_expr
+|  3 = @decimal_literal_expr
+|  4 = @int_literal_expr
+|  5 = @long_literal_expr
+|  6 = @uint_literal_expr
+|  7 = @ulong_literal_expr
+|  8 = @float_literal_expr
+|  9 = @double_literal_expr
+| 10 = @string_literal_expr
+| 11 = @null_literal_expr
+/* primary & unary */
+| 12 = @this_access_expr
+| 13 = @base_access_expr
+| 14 = @local_variable_access_expr
+| 15 = @parameter_access_expr
+| 16 = @field_access_expr
+| 17 = @property_access_expr
+| 18 = @method_access_expr
+| 19 = @event_access_expr
+| 20 = @indexer_access_expr
+| 21 = @array_access_expr
+| 22 = @type_access_expr
+| 23 = @typeof_expr
+| 24 = @method_invocation_expr
+| 25 = @delegate_invocation_expr
+| 26 = @operator_invocation_expr
+| 27 = @cast_expr
+| 28 = @object_creation_expr
+| 29 = @explicit_delegate_creation_expr
+| 30 = @implicit_delegate_creation_expr
+| 31 = @array_creation_expr
+| 32 = @default_expr
+| 33 = @plus_expr
+| 34 = @minus_expr
+| 35 = @bit_not_expr
+| 36 = @log_not_expr
+| 37 = @post_incr_expr
+| 38 = @post_decr_expr
+| 39 = @pre_incr_expr
+| 40 = @pre_decr_expr
+/* multiplicative */
+| 41 = @mul_expr
+| 42 = @div_expr
+| 43 = @rem_expr
+/* additive */
+| 44 = @add_expr
+| 45 = @sub_expr
+/* shift */
+| 46 = @lshift_expr
+| 47 = @rshift_expr
+/* relational */
+| 48 = @lt_expr
+| 49 = @gt_expr
+| 50 = @le_expr
+| 51 = @ge_expr
+/* equality */
+| 52 = @eq_expr
+| 53 = @ne_expr
+/* logical */
+| 54 = @bit_and_expr
+| 55 = @bit_xor_expr
+| 56 = @bit_or_expr
+| 57 = @log_and_expr
+| 58 = @log_or_expr
+/* type testing */
+| 59 = @is_expr
+| 60 = @as_expr
+/* null coalescing */
+| 61 = @null_coalescing_expr
+/* conditional */
+| 62 = @conditional_expr
+/* assignment */
+| 63 = @simple_assign_expr
+| 64 = @assign_add_expr
+| 65 = @assign_sub_expr
+| 66 = @assign_mul_expr
+| 67 = @assign_div_expr
+| 68 = @assign_rem_expr
+| 69 = @assign_and_expr
+| 70 = @assign_xor_expr
+| 71 = @assign_or_expr
+| 72 = @assign_lshift_expr
+| 73 = @assign_rshift_expr
+/* more */
+| 74 = @object_init_expr
+| 75 = @collection_init_expr
+| 76 = @array_init_expr
+| 77 = @checked_expr
+| 78 = @unchecked_expr
+| 79 = @constructor_init_expr
+| 80 = @add_event_expr
+| 81 = @remove_event_expr
+| 82 = @par_expr
+| 83 = @local_var_decl_expr
+| 84 = @lambda_expr
+| 85 = @anonymous_method_expr
+| 86 = @namespace_expr
+/* dynamic */
+| 92 = @dynamic_element_access_expr
+| 93 = @dynamic_member_access_expr
+/* unsafe */
+| 100 = @pointer_indirection_expr
+| 101 = @address_of_expr
+| 102 = @sizeof_expr
+/* async */
+| 103 = @await_expr
+/* C# 6.0 */
+| 104 = @nameof_expr
+| 105 = @interpolated_string_expr
+| 106 = @unknown_expr
+/* C# 7.0 */
+| 107 = @throw_expr
+| 108 = @tuple_expr
+| 109 = @local_function_invocation_expr
+| 110 = @ref_expr
+| 111 = @discard_expr
+/* C# 8.0 */
+| 112 = @range_expr
+| 113 = @index_expr
+| 114 = @switch_expr
+| 115 = @recursive_pattern_expr
+| 116 = @property_pattern_expr
+| 117 = @positional_pattern_expr
+| 118 = @switch_case_expr
+| 119 = @assign_coalesce_expr
+| 120 = @suppress_nullable_warning_expr
+| 121 = @namespace_access_expr
+/* C# 9.0 */
+| 122 = @lt_pattern_expr
+| 123 = @gt_pattern_expr
+| 124 = @le_pattern_expr
+| 125 = @ge_pattern_expr
+| 126 = @not_pattern_expr
+| 127 = @and_pattern_expr
+| 128 = @or_pattern_expr
+| 129 = @function_pointer_invocation_expr
+| 130 = @with_expr
+/* C# 11.0 */
+| 131 = @list_pattern_expr
+| 132 = @slice_pattern_expr
+/* Preprocessor */
+| 999 = @define_symbol_expr
+;
+
+@switch = @switch_stmt | @switch_expr;
+@case = @case_stmt | @switch_case_expr;
+@pattern_match = @case | @is_expr;
+@unary_pattern_expr = @not_pattern_expr;
+@relational_pattern_expr = @gt_pattern_expr | @lt_pattern_expr | @ge_pattern_expr | @le_pattern_expr;
+@binary_pattern_expr = @and_pattern_expr | @or_pattern_expr;
+
+@integer_literal_expr = @int_literal_expr | @long_literal_expr | @uint_literal_expr | @ulong_literal_expr;
+@real_literal_expr = @float_literal_expr | @double_literal_expr | @decimal_literal_expr;
+@literal_expr = @bool_literal_expr | @char_literal_expr | @integer_literal_expr | @real_literal_expr
+              | @string_literal_expr | @null_literal_expr;
+
+@assign_expr = @simple_assign_expr | @assign_op_expr | @local_var_decl_expr;
+@assign_op_expr =  @assign_arith_expr | @assign_bitwise_expr | @assign_event_expr | @assign_coalesce_expr;
+@assign_event_expr = @add_event_expr | @remove_event_expr;
+
+@assign_arith_expr = @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr
+                   | @assign_rem_expr
+@assign_bitwise_expr = @assign_and_expr | @assign_or_expr | @assign_xor_expr
+                   | @assign_lshift_expr | @assign_rshift_expr;
+
+@member_access_expr = @field_access_expr | @property_access_expr | @indexer_access_expr | @event_access_expr
+                    | @method_access_expr | @type_access_expr | @dynamic_member_access_expr;
+@access_expr = @member_access_expr | @this_access_expr | @base_access_expr | @assignable_access_expr | @namespace_access_expr;
+@element_access_expr = @indexer_access_expr | @array_access_expr | @dynamic_element_access_expr;
+
+@local_variable_access = @local_variable_access_expr | @local_var_decl_expr;
+@local_scope_variable_access_expr = @parameter_access_expr | @local_variable_access;
+@variable_access_expr = @local_scope_variable_access_expr | @field_access_expr;
+
+@assignable_access_expr = @variable_access_expr | @property_access_expr | @element_access_expr
+                        | @event_access_expr | @dynamic_member_access_expr;
+
+@objectorcollection_init_expr = @object_init_expr | @collection_init_expr;
+
+@delegate_creation_expr = @explicit_delegate_creation_expr | @implicit_delegate_creation_expr;
+
+@bin_arith_op_expr = @mul_expr | @div_expr | @rem_expr | @add_expr | @sub_expr;
+@incr_op_expr =  @pre_incr_expr | @post_incr_expr;
+@decr_op_expr =  @pre_decr_expr | @post_decr_expr;
+@mut_op_expr = @incr_op_expr | @decr_op_expr;
+@un_arith_op_expr = @plus_expr | @minus_expr | @mut_op_expr;
+@arith_op_expr = @bin_arith_op_expr | @un_arith_op_expr;
+
+@ternary_log_op_expr = @conditional_expr;
+@bin_log_op_expr = @log_and_expr | @log_or_expr | @null_coalescing_expr;
+@un_log_op_expr = @log_not_expr;
+@log_expr = @un_log_op_expr | @bin_log_op_expr | @ternary_log_op_expr;
+
+@bin_bit_op_expr =  @bit_and_expr | @bit_or_expr | @bit_xor_expr | @lshift_expr
+                 | @rshift_expr;
+@un_bit_op_expr = @bit_not_expr;
+@bit_expr = @un_bit_op_expr | @bin_bit_op_expr;
+
+@equality_op_expr =  @eq_expr | @ne_expr;
+@rel_op_expr = @gt_expr | @lt_expr| @ge_expr | @le_expr;
+@comp_expr = @equality_op_expr | @rel_op_expr;
+
+@op_expr = @assign_expr | @un_op | @bin_op | @ternary_op;
+
+@ternary_op = @ternary_log_op_expr;
+@bin_op = @bin_arith_op_expr | @bin_log_op_expr | @bin_bit_op_expr | @comp_expr;
+@un_op = @un_arith_op_expr | @un_log_op_expr | @un_bit_op_expr | @sizeof_expr
+       | @pointer_indirection_expr | @address_of_expr;
+
+@anonymous_function_expr = @lambda_expr | @anonymous_method_expr;
+
+@call = @method_invocation_expr | @constructor_init_expr | @operator_invocation_expr
+      | @delegate_invocation_expr | @object_creation_expr | @call_access_expr
+      | @local_function_invocation_expr | @function_pointer_invocation_expr;
+
+@call_access_expr = @property_access_expr | @event_access_expr | @indexer_access_expr;
+
+@late_bindable_expr = @dynamic_element_access_expr | @dynamic_member_access_expr
+                    | @object_creation_expr | @method_invocation_expr | @operator_invocation_expr;
+
+@throw_element = @throw_expr | @throw_stmt;
+
+@implicitly_typeable_object_creation_expr = @object_creation_expr | @explicit_delegate_creation_expr;
+
+implicitly_typed_array_creation(
+  unique int id: @array_creation_expr ref);
+
+explicitly_sized_array_creation(
+  unique int id: @array_creation_expr ref);
+
+stackalloc_array_creation(
+  unique int id: @array_creation_expr ref);
+
+implicitly_typed_object_creation(
+  unique int id: @implicitly_typeable_object_creation_expr ref);
+
+mutator_invocation_mode(
+  unique int id: @operator_invocation_expr ref,
+  int mode: int ref /* prefix = 1, postfix = 2*/);
+
+expr_compiler_generated(
+  unique int id: @expr ref);
+
+expr_value(
+  unique int id: @expr ref,
+  string value: string ref);
+
+expr_call(
+  unique int caller_id: @expr ref,
+  int target_id: @callable ref);
+
+expr_access(
+  unique int accesser_id: @access_expr ref,
+  int target_id: @accessible ref);
+
+@accessible = @method | @assignable | @local_function | @namespace;
+
+expr_location(
+  unique int id: @expr ref,
+  int loc: @location ref);
+
+dynamic_member_name(
+  unique int id: @late_bindable_expr ref,
+  string name: string ref);
+
+@qualifiable_expr = @member_access_expr
+                  | @method_invocation_expr
+                  | @element_access_expr;
+
+conditional_access(
+  unique int id: @qualifiable_expr ref);
+
+expr_argument(
+  unique int id: @expr ref,
+  int mode: int ref);
+  /* mode is the same as params: value = 0, ref = 1, out = 2 */
+
+expr_argument_name(
+  unique int id: @expr ref,
+  string name: string ref);
+
+lambda_expr_return_type(
+  unique int id: @lambda_expr ref,
+  int type_id: @type_or_ref ref);
+  
+/** CONTROL/DATA FLOW **/
+
+@control_flow_element = @stmt | @expr;
+
+/* 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;
+
+/* Comments */
+
+commentline(
+  unique int id: @commentline,
+  int kind: int ref,
+  string text: string ref,
+  string rawtext: string ref);
+
+case @commentline.kind of
+  0 = @singlelinecomment
+| 1 = @xmldoccomment
+| 2 = @multilinecomment;
+
+commentline_location(
+  unique int id: @commentline ref,
+  int loc: @location ref);
+
+commentblock(
+  unique int id : @commentblock);
+
+commentblock_location(
+  unique int id: @commentblock ref,
+  int loc: @location ref);
+
+commentblock_binding(
+  int id: @commentblock ref,
+  int entity: @element ref,
+  int bindtype: int ref);    /* 0: Parent, 1: Best, 2: Before, 3: After */
+
+commentblock_child(
+  int id: @commentblock ref,
+  int commentline: @commentline ref,
+  int index: int ref);
+
+/* ASP.NET */
+
+case @asp_element.kind of
+  0=@asp_close_tag
+| 1=@asp_code
+| 2=@asp_comment
+| 3=@asp_data_binding
+| 4=@asp_directive
+| 5=@asp_open_tag
+| 6=@asp_quoted_string
+| 7=@asp_text
+| 8=@asp_xml_directive;
+
+@asp_attribute = @asp_code | @asp_data_binding | @asp_quoted_string;
+
+asp_elements(
+  unique int id: @asp_element,
+  int kind: int ref,
+  int loc: @location ref);
+
+asp_comment_server(unique int comment: @asp_comment ref);
+asp_code_inline(unique int code: @asp_code ref);
+asp_directive_attribute(
+  int directive: @asp_directive ref,
+  int index: int ref,
+  string name: string ref,
+  int value: @asp_quoted_string ref);
+asp_directive_name(
+  unique int directive: @asp_directive ref,
+  string name: string ref);
+asp_element_body(
+  unique int element: @asp_element ref,
+  string body: string ref);
+asp_tag_attribute(
+  int tag: @asp_open_tag ref,
+  int index: int ref,
+  string name: string ref,
+  int attribute: @asp_attribute ref);
+asp_tag_name(
+  unique int tag: @asp_open_tag ref,
+  string name: string ref);
+asp_tag_isempty(int tag: @asp_open_tag ref);
+
+/* Common Intermediate Language - CIL */
+
+case @cil_instruction.opcode of
+  0 = @cil_nop
+| 1 = @cil_break
+| 2 = @cil_ldarg_0
+| 3 = @cil_ldarg_1
+| 4 = @cil_ldarg_2
+| 5 = @cil_ldarg_3
+| 6 = @cil_ldloc_0
+| 7 = @cil_ldloc_1
+| 8 = @cil_ldloc_2
+| 9 = @cil_ldloc_3
+| 10 = @cil_stloc_0
+| 11 = @cil_stloc_1
+| 12 = @cil_stloc_2
+| 13 = @cil_stloc_3
+| 14 = @cil_ldarg_s
+| 15 = @cil_ldarga_s
+| 16 = @cil_starg_s
+| 17 = @cil_ldloc_s
+| 18 = @cil_ldloca_s
+| 19 = @cil_stloc_s
+| 20 = @cil_ldnull
+| 21 = @cil_ldc_i4_m1
+| 22 = @cil_ldc_i4_0
+| 23 = @cil_ldc_i4_1
+| 24 = @cil_ldc_i4_2
+| 25 = @cil_ldc_i4_3
+| 26 = @cil_ldc_i4_4
+| 27 = @cil_ldc_i4_5
+| 28 = @cil_ldc_i4_6
+| 29 = @cil_ldc_i4_7
+| 30 = @cil_ldc_i4_8
+| 31 = @cil_ldc_i4_s
+| 32 = @cil_ldc_i4
+| 33 = @cil_ldc_i8
+| 34 = @cil_ldc_r4
+| 35 = @cil_ldc_r8
+| 37 = @cil_dup
+| 38 = @cil_pop
+| 39 = @cil_jmp
+| 40 = @cil_call
+| 41 = @cil_calli
+| 42 = @cil_ret
+| 43 = @cil_br_s
+| 44 = @cil_brfalse_s
+| 45 = @cil_brtrue_s
+| 46 = @cil_beq_s
+| 47 = @cil_bge_s
+| 48 = @cil_bgt_s
+| 49 = @cil_ble_s
+| 50 = @cil_blt_s
+| 51 = @cil_bne_un_s
+| 52 = @cil_bge_un_s
+| 53 = @cil_bgt_un_s
+| 54 = @cil_ble_un_s
+| 55 = @cil_blt_un_s
+| 56 = @cil_br
+| 57 = @cil_brfalse
+| 58 = @cil_brtrue
+| 59 = @cil_beq
+| 60 = @cil_bge
+| 61 = @cil_bgt
+| 62 = @cil_ble
+| 63 = @cil_blt
+| 64 = @cil_bne_un
+| 65 = @cil_bge_un
+| 66 = @cil_bgt_un
+| 67 = @cil_ble_un
+| 68 = @cil_blt_un
+| 69 = @cil_switch
+| 70 = @cil_ldind_i1
+| 71 = @cil_ldind_u1
+| 72 = @cil_ldind_i2
+| 73 = @cil_ldind_u2
+| 74 = @cil_ldind_i4
+| 75 = @cil_ldind_u4
+| 76 = @cil_ldind_i8
+| 77 = @cil_ldind_i
+| 78 = @cil_ldind_r4
+| 79 = @cil_ldind_r8
+| 80 = @cil_ldind_ref
+| 81 = @cil_stind_ref
+| 82 = @cil_stind_i1
+| 83 = @cil_stind_i2
+| 84 = @cil_stind_i4
+| 85 = @cil_stind_i8
+| 86 = @cil_stind_r4
+| 87 = @cil_stind_r8
+| 88 = @cil_add
+| 89 = @cil_sub
+| 90 = @cil_mul
+| 91 = @cil_div
+| 92 = @cil_div_un
+| 93 = @cil_rem
+| 94 = @cil_rem_un
+| 95 = @cil_and
+| 96 = @cil_or
+| 97 = @cil_xor
+| 98 = @cil_shl
+| 99 = @cil_shr
+| 100 = @cil_shr_un
+| 101 = @cil_neg
+| 102 = @cil_not
+| 103 = @cil_conv_i1
+| 104 = @cil_conv_i2
+| 105 = @cil_conv_i4
+| 106 = @cil_conv_i8
+| 107 = @cil_conv_r4
+| 108 = @cil_conv_r8
+| 109 = @cil_conv_u4
+| 110 = @cil_conv_u8
+| 111 = @cil_callvirt
+| 112 = @cil_cpobj
+| 113 = @cil_ldobj
+| 114 = @cil_ldstr
+| 115 = @cil_newobj
+| 116 = @cil_castclass
+| 117 = @cil_isinst
+| 118 = @cil_conv_r_un
+| 121 = @cil_unbox
+| 122 = @cil_throw
+| 123 = @cil_ldfld
+| 124 = @cil_ldflda
+| 125 = @cil_stfld
+| 126 = @cil_ldsfld
+| 127 = @cil_ldsflda
+| 128 = @cil_stsfld
+| 129 = @cil_stobj
+| 130 = @cil_conv_ovf_i1_un
+| 131 = @cil_conv_ovf_i2_un
+| 132 = @cil_conv_ovf_i4_un
+| 133 = @cil_conv_ovf_i8_un
+| 134 = @cil_conv_ovf_u1_un
+| 135 = @cil_conv_ovf_u2_un
+| 136 = @cil_conv_ovf_u4_un
+| 137 = @cil_conv_ovf_u8_un
+| 138 = @cil_conv_ovf_i_un
+| 139 = @cil_conv_ovf_u_un
+| 140 = @cil_box
+| 141 = @cil_newarr
+| 142 = @cil_ldlen
+| 143 = @cil_ldelema
+| 144 = @cil_ldelem_i1
+| 145 = @cil_ldelem_u1
+| 146 = @cil_ldelem_i2
+| 147 = @cil_ldelem_u2
+| 148 = @cil_ldelem_i4
+| 149 = @cil_ldelem_u4
+| 150 = @cil_ldelem_i8
+| 151 = @cil_ldelem_i
+| 152 = @cil_ldelem_r4
+| 153 = @cil_ldelem_r8
+| 154 = @cil_ldelem_ref
+| 155 = @cil_stelem_i
+| 156 = @cil_stelem_i1
+| 157 = @cil_stelem_i2
+| 158 = @cil_stelem_i4
+| 159 = @cil_stelem_i8
+| 160 = @cil_stelem_r4
+| 161 = @cil_stelem_r8
+| 162 = @cil_stelem_ref
+| 163 = @cil_ldelem
+| 164 = @cil_stelem
+| 165 = @cil_unbox_any
+| 179 = @cil_conv_ovf_i1
+| 180 = @cil_conv_ovf_u1
+| 181 = @cil_conv_ovf_i2
+| 182 = @cil_conv_ovf_u2
+| 183 = @cil_conv_ovf_i4
+| 184 = @cil_conv_ovf_u4
+| 185 = @cil_conv_ovf_i8
+| 186 = @cil_conv_ovf_u8
+| 194 = @cil_refanyval
+| 195 = @cil_ckinfinite
+| 198 = @cil_mkrefany
+| 208 = @cil_ldtoken
+| 209 = @cil_conv_u2
+| 210 = @cil_conv_u1
+| 211 = @cil_conv_i
+| 212 = @cil_conv_ovf_i
+| 213 = @cil_conv_ovf_u
+| 214 = @cil_add_ovf
+| 215 = @cil_add_ovf_un
+| 216 = @cil_mul_ovf
+| 217 = @cil_mul_ovf_un
+| 218 = @cil_sub_ovf
+| 219 = @cil_sub_ovf_un
+| 220 = @cil_endfinally
+| 221 = @cil_leave
+| 222 = @cil_leave_s
+| 223 = @cil_stind_i
+| 224 = @cil_conv_u
+| 65024 = @cil_arglist
+| 65025 = @cil_ceq
+| 65026 = @cil_cgt
+| 65027 = @cil_cgt_un
+| 65028 = @cil_clt
+| 65029 = @cil_clt_un
+| 65030 = @cil_ldftn
+| 65031 = @cil_ldvirtftn
+| 65033 = @cil_ldarg
+| 65034 = @cil_ldarga
+| 65035 = @cil_starg
+| 65036 = @cil_ldloc
+| 65037 = @cil_ldloca
+| 65038 = @cil_stloc
+| 65039 = @cil_localloc
+| 65041 = @cil_endfilter
+| 65042 = @cil_unaligned
+| 65043 = @cil_volatile
+| 65044 = @cil_tail
+| 65045 = @cil_initobj
+| 65046 = @cil_constrained
+| 65047 = @cil_cpblk
+| 65048 = @cil_initblk
+| 65050 = @cil_rethrow
+| 65052 = @cil_sizeof
+| 65053 = @cil_refanytype
+| 65054 = @cil_readonly
+;
+
+// CIL ignored instructions
+
+@cil_ignore = @cil_nop | @cil_break | @cil_volatile | @cil_unaligned;
+
+// CIL local/parameter/field access
+
+@cil_ldarg_any = @cil_ldarg_0 | @cil_ldarg_1 | @cil_ldarg_2 | @cil_ldarg_3 | @cil_ldarg_s | @cil_ldarga_s | @cil_ldarg | @cil_ldarga;
+@cil_starg_any = @cil_starg | @cil_starg_s;
+
+@cil_ldloc_any = @cil_ldloc_0 | @cil_ldloc_1 | @cil_ldloc_2 | @cil_ldloc_3 | @cil_ldloc_s | @cil_ldloca_s | @cil_ldloc | @cil_ldloca;
+@cil_stloc_any = @cil_stloc_0 | @cil_stloc_1 | @cil_stloc_2 | @cil_stloc_3 | @cil_stloc_s | @cil_stloc;
+
+@cil_ldfld_any = @cil_ldfld | @cil_ldsfld | @cil_ldsflda | @cil_ldflda;
+@cil_stfld_any = @cil_stfld | @cil_stsfld;
+
+@cil_local_access = @cil_stloc_any | @cil_ldloc_any;
+@cil_arg_access = @cil_starg_any | @cil_ldarg_any;
+@cil_read_access = @cil_ldloc_any | @cil_ldarg_any | @cil_ldfld_any;
+@cil_write_access = @cil_stloc_any | @cil_starg_any | @cil_stfld_any;
+
+@cil_stack_access = @cil_local_access | @cil_arg_access;
+@cil_field_access = @cil_ldfld_any | @cil_stfld_any;
+
+@cil_access = @cil_read_access | @cil_write_access;
+
+// CIL constant/literal instructions
+
+@cil_ldc_i = @cil_ldc_i4_any | @cil_ldc_i8;
+
+@cil_ldc_i4_any = @cil_ldc_i4_m1 | @cil_ldc_i4_0 | @cil_ldc_i4_1 | @cil_ldc_i4_2 | @cil_ldc_i4_3 |
+  @cil_ldc_i4_4 | @cil_ldc_i4_5 | @cil_ldc_i4_6 | @cil_ldc_i4_7 | @cil_ldc_i4_8 | @cil_ldc_i4_s | @cil_ldc_i4;
+
+@cil_ldc_r = @cil_ldc_r4 | @cil_ldc_r8;
+
+@cil_literal = @cil_ldnull | @cil_ldc_i | @cil_ldc_r | @cil_ldstr;
+
+// Control flow
+
+@cil_conditional_jump = @cil_binary_jump | @cil_unary_jump;
+@cil_binary_jump = @cil_beq_s | @cil_bge_s | @cil_bgt_s | @cil_ble_s | @cil_blt_s |
+    @cil_bne_un_s | @cil_bge_un_s | @cil_bgt_un_s | @cil_ble_un_s | @cil_blt_un_s |
+    @cil_beq | @cil_bge | @cil_bgt | @cil_ble | @cil_blt |
+    @cil_bne_un | @cil_bge_un | @cil_bgt_un | @cil_ble_un | @cil_blt_un;
+@cil_unary_jump = @cil_brfalse_s | @cil_brtrue_s | @cil_brfalse | @cil_brtrue | @cil_switch;
+@cil_unconditional_jump = @cil_br | @cil_br_s | @cil_leave_any;
+@cil_leave_any = @cil_leave | @cil_leave_s;
+@cil_jump = @cil_unconditional_jump | @cil_conditional_jump;
+
+// CIL call instructions
+
+@cil_call_any = @cil_jmp | @cil_call | @cil_calli | @cil_tail | @cil_callvirt | @cil_newobj;
+
+// CIL expression instructions
+
+@cil_expr = @cil_literal | @cil_binary_expr | @cil_unary_expr | @cil_call_any | @cil_read_access |
+  @cil_newarr | @cil_ldtoken | @cil_sizeof |
+  @cil_ldftn | @cil_ldvirtftn | @cil_localloc | @cil_mkrefany | @cil_refanytype | @cil_arglist | @cil_dup;
+
+@cil_unary_expr =
+  @cil_conversion_operation | @cil_unary_arithmetic_operation | @cil_unary_bitwise_operation|
+  @cil_ldlen | @cil_isinst | @cil_box | @cil_ldobj | @cil_castclass | @cil_unbox_any |
+  @cil_ldind | @cil_unbox;
+
+@cil_conversion_operation =
+  @cil_conv_i1 | @cil_conv_i2 | @cil_conv_i4 | @cil_conv_i8 |
+  @cil_conv_u1 | @cil_conv_u2 | @cil_conv_u4 | @cil_conv_u8 |
+  @cil_conv_ovf_i | @cil_conv_ovf_i_un | @cil_conv_ovf_i1 | @cil_conv_ovf_i1_un |
+  @cil_conv_ovf_i2 | @cil_conv_ovf_i2_un | @cil_conv_ovf_i4 | @cil_conv_ovf_i4_un |
+  @cil_conv_ovf_i8 | @cil_conv_ovf_i8_un | @cil_conv_ovf_u | @cil_conv_ovf_u_un |
+  @cil_conv_ovf_u1 | @cil_conv_ovf_u1_un | @cil_conv_ovf_u2 | @cil_conv_ovf_u2_un |
+  @cil_conv_ovf_u4 | @cil_conv_ovf_u4_un | @cil_conv_ovf_u8 | @cil_conv_ovf_u8_un |
+  @cil_conv_r4 | @cil_conv_r8 | @cil_conv_ovf_u2 | @cil_conv_ovf_u2_un |
+  @cil_conv_i | @cil_conv_u | @cil_conv_r_un;
+
+@cil_ldind = @cil_ldind_i | @cil_ldind_i1 | @cil_ldind_i2 | @cil_ldind_i4 | @cil_ldind_i8 |
+  @cil_ldind_r4 | @cil_ldind_r8 | @cil_ldind_ref | @cil_ldind_u1 | @cil_ldind_u2 | @cil_ldind_u4;
+
+@cil_stind = @cil_stind_i | @cil_stind_i1 | @cil_stind_i2 | @cil_stind_i4 | @cil_stind_i8 |
+  @cil_stind_r4 | @cil_stind_r8 | @cil_stind_ref;
+
+@cil_bitwise_operation = @cil_binary_bitwise_operation | @cil_unary_bitwise_operation;
+
+@cil_binary_bitwise_operation = @cil_and | @cil_or | @cil_xor | @cil_shr | @cil_shr | @cil_shr_un | @cil_shl;
+
+@cil_binary_arithmetic_operation = @cil_add | @cil_sub | @cil_mul | @cil_div | @cil_div_un |
+  @cil_rem | @cil_rem_un | @cil_add_ovf | @cil_add_ovf_un | @cil_mul_ovf | @cil_mul_ovf_un |
+  @cil_sub_ovf | @cil_sub_ovf_un;
+
+@cil_unary_bitwise_operation = @cil_not;
+
+@cil_binary_expr = @cil_binary_arithmetic_operation | @cil_binary_bitwise_operation | @cil_read_array | @cil_comparison_operation;
+
+@cil_unary_arithmetic_operation = @cil_neg;
+
+@cil_comparison_operation = @cil_cgt_un | @cil_ceq | @cil_cgt | @cil_clt | @cil_clt_un;
+
+// Elements that retrieve an address of something
+@cil_read_ref = @cil_ldloca_s | @cil_ldarga_s | @cil_ldflda | @cil_ldsflda | @cil_ldelema;
+
+// CIL array instructions
+
+@cil_read_array =
+  @cil_ldelem | @cil_ldelema | @cil_ldelem_i1 | @cil_ldelem_ref | @cil_ldelem_i |
+  @cil_ldelem_i1 | @cil_ldelem_i2 | @cil_ldelem_i4 | @cil_ldelem_i8 | @cil_ldelem_r4 |
+  @cil_ldelem_r8 | @cil_ldelem_u1 | @cil_ldelem_u2 | @cil_ldelem_u4;
+
+@cil_write_array = @cil_stelem | @cil_stelem_ref |
+  @cil_stelem_i | @cil_stelem_i1 | @cil_stelem_i2 | @cil_stelem_i4 | @cil_stelem_i8 |
+  @cil_stelem_r4 | @cil_stelem_r8;
+
+@cil_throw_any = @cil_throw | @cil_rethrow;
+
+#keyset[impl, index]
+cil_instruction(
+  unique int id: @cil_instruction,
+  int opcode: int ref,
+  int index: int ref,
+  int impl: @cil_method_implementation ref);
+
+cil_jump(
+  unique int instruction: @cil_jump ref,
+  int target: @cil_instruction ref);
+
+cil_access(
+  unique int instruction: @cil_instruction ref,
+  int target: @cil_accessible ref);
+
+cil_value(
+  unique int instruction: @cil_literal ref,
+  string value: string ref);
+
+#keyset[instruction, index]
+cil_switch(
+  int instruction: @cil_switch ref,
+  int index: int ref,
+  int target: @cil_instruction ref);
+
+cil_instruction_location(
+  unique int id: @cil_instruction ref,
+  int loc: @location ref);
+
+cil_type_location(
+  int id: @cil_type ref,
+  int loc: @location ref);
+
+cil_method_location(
+  int id: @cil_method ref,
+  int loc: @location ref);
+
+@cil_namespace = @namespace;
+
+@cil_type_container = @cil_type | @cil_namespace | @cil_method;
+
+case @cil_type.kind of
+  0 = @cil_valueorreftype
+| 1 = @cil_typeparameter
+| 2 = @cil_array_type
+| 3 = @cil_pointer_type
+| 4 = @cil_function_pointer_type
+;
+
+cil_type(
+  unique int id: @cil_type,
+  string name: string ref,
+  int kind: int ref,
+  int parent: @cil_type_container ref,
+  int sourceDecl: @cil_type ref);
+
+cil_pointer_type(
+  unique int id: @cil_pointer_type ref,
+  int pointee: @cil_type ref);
+
+cil_array_type(
+  unique int id: @cil_array_type ref,
+  int element_type: @cil_type ref,
+  int rank: int ref);
+
+cil_function_pointer_return_type(
+  unique int id: @cil_function_pointer_type ref,
+  int return_type: @cil_type ref);
+
+cil_method(
+  unique int id: @cil_method,
+  string name: string ref,
+  int parent: @cil_type ref,
+  int return_type: @cil_type ref);
+
+cil_method_source_declaration(
+  unique int method: @cil_method ref,
+  int source: @cil_method ref);
+
+cil_method_implementation(
+  unique int id: @cil_method_implementation,
+  int method: @cil_method ref,
+  int location: @assembly ref);
+
+cil_implements(
+  int id: @cil_method ref,
+  int decl: @cil_method ref);
+
+#keyset[parent, name]
+cil_field(
+  unique int id: @cil_field,
+  int parent: @cil_type ref,
+  string name: string ref,
+  int field_type: @cil_type ref);
+
+@cil_element = @cil_instruction | @cil_declaration | @cil_handler | @cil_attribute | @cil_namespace;
+@cil_named_element = @cil_declaration | @cil_namespace;
+@cil_declaration = @cil_variable | @cil_method | @cil_type | @cil_member;
+@cil_accessible = @cil_declaration;
+@cil_variable = @cil_field | @cil_stack_variable;
+@cil_stack_variable = @cil_local_variable | @cil_parameter;
+@cil_member = @cil_method | @cil_type | @cil_field | @cil_property | @cil_event;
+@cil_custom_modifier_receiver = @cil_method | @cil_property | @cil_parameter | @cil_field | @cil_function_pointer_type;
+@cil_parameterizable = @cil_method | @cil_function_pointer_type;
+@cil_has_type_annotation = @cil_stack_variable | @cil_property | @cil_method | @cil_function_pointer_type;
+
+#keyset[parameterizable, index]
+cil_parameter(
+  unique int id: @cil_parameter,
+  int parameterizable: @cil_parameterizable ref,
+  int index: int ref,
+  int param_type: @cil_type ref);
+
+cil_parameter_in(unique int id: @cil_parameter ref);
+cil_parameter_out(unique int id: @cil_parameter ref);
+
+cil_setter(unique int prop: @cil_property ref,
+  int method: @cil_method ref);
+
+#keyset[id, modifier]
+cil_custom_modifiers(
+  int id: @cil_custom_modifier_receiver ref,
+  int modifier: @cil_type ref,
+  int kind: int ref); // modreq: 1, modopt: 0
+
+cil_type_annotation(
+  int id: @cil_has_type_annotation ref,
+  int annotation: int ref);
+
+cil_getter(unique int prop: @cil_property ref,
+  int method: @cil_method ref);
+
+cil_adder(unique int event: @cil_event ref,
+  int method: @cil_method ref);
+
+cil_remover(unique int event: @cil_event ref, int method: @cil_method ref);
+
+cil_raiser(unique int event: @cil_event ref, int method: @cil_method ref);
+
+cil_property(
+  unique int id: @cil_property,
+  int parent: @cil_type ref,
+  string name: string ref,
+  int property_type: @cil_type ref);
+
+#keyset[parent, name]
+cil_event(unique int id: @cil_event,
+  int parent: @cil_type ref,
+  string name: string ref,
+  int event_type: @cil_type ref);
+
+#keyset[impl, index]
+cil_local_variable(
+  unique int id: @cil_local_variable,
+  int impl: @cil_method_implementation ref,
+  int index: int ref,
+  int var_type: @cil_type ref);
+
+cil_function_pointer_calling_conventions(
+  int id: @cil_function_pointer_type ref,
+  int kind: int ref);
+
+// CIL handlers (exception handlers etc).
+
+case @cil_handler.kind of
+  0 = @cil_catch_handler
+| 1 = @cil_filter_handler
+| 2 = @cil_finally_handler
+| 4 = @cil_fault_handler
+;
+
+#keyset[impl, index]
+cil_handler(
+  unique int id: @cil_handler,
+  int impl: @cil_method_implementation ref,
+  int index: int ref,
+  int kind: int ref,
+  int try_start: @cil_instruction ref,
+  int try_end: @cil_instruction ref,
+  int handler_start: @cil_instruction ref);
+
+cil_handler_filter(
+  unique int id: @cil_handler ref,
+  int filter_start: @cil_instruction ref);
+
+cil_handler_type(
+  unique int id: @cil_handler ref,
+  int catch_type: @cil_type ref);
+
+@cil_controlflow_node = @cil_entry_point | @cil_instruction;
+
+@cil_entry_point = @cil_method_implementation | @cil_handler;
+
+@cil_dataflow_node = @cil_instruction | @cil_variable | @cil_method;
+
+cil_method_stack_size(
+  unique int method: @cil_method_implementation ref,
+  int size: int ref);
+
+// CIL modifiers
+
+cil_public(int id: @cil_member ref);
+cil_private(int id: @cil_member ref);
+cil_protected(int id: @cil_member ref);
+cil_internal(int id: @cil_member ref);
+cil_static(int id: @cil_member ref);
+cil_sealed(int id: @cil_member ref);
+cil_virtual(int id: @cil_method ref);
+cil_abstract(int id: @cil_member ref);
+cil_class(int id: @cil_type ref);
+cil_interface(int id: @cil_type ref);
+cil_security(int id: @cil_member ref);
+cil_requiresecobject(int id: @cil_method ref);
+cil_specialname(int id: @cil_method ref);
+cil_newslot(int id: @cil_method ref);
+
+cil_base_class(unique int id: @cil_type ref, int base: @cil_type ref);
+cil_base_interface(int id: @cil_type ref, int base: @cil_type ref);
+cil_enum_underlying_type(unique int id: @cil_type ref, int underlying: @cil_type ref);
+
+#keyset[unbound, index]
+cil_type_parameter(
+  int unbound: @cil_member ref,
+  int index: int ref,
+  int param: @cil_typeparameter ref);
+
+#keyset[bound, index]
+cil_type_argument(
+  int bound: @cil_member ref,
+  int index: int ref,
+  int t: @cil_type ref);
+
+// CIL type parameter constraints
+
+cil_typeparam_covariant(int tp: @cil_typeparameter ref);
+cil_typeparam_contravariant(int tp: @cil_typeparameter ref);
+cil_typeparam_class(int tp: @cil_typeparameter ref);
+cil_typeparam_struct(int tp: @cil_typeparameter ref);
+cil_typeparam_new(int tp: @cil_typeparameter ref);
+cil_typeparam_constraint(int tp: @cil_typeparameter ref, int supertype: @cil_type ref);
+
+// CIL attributes
+
+cil_attribute(
+  unique int attributeid: @cil_attribute,
+  int element: @cil_declaration ref,
+  int constructor: @cil_method ref);
+
+#keyset[attribute_id, param]
+cil_attribute_named_argument(
+  int attribute_id: @cil_attribute ref,
+  string param: string ref,
+  string value: string ref);
+
+#keyset[attribute_id, index]
+cil_attribute_positional_argument(
+  int attribute_id: @cil_attribute ref,
+  int index: int ref,
+  string value: string ref);
+
+
+// Common .Net data model covering both C# and CIL
+
+// Common elements
+@dotnet_element = @element | @cil_element;
+@dotnet_named_element = @named_element | @cil_named_element;
+@dotnet_callable = @callable | @cil_method;
+@dotnet_variable = @variable | @cil_variable;
+@dotnet_field = @field | @cil_field;
+@dotnet_parameter = @parameter | @cil_parameter;
+@dotnet_declaration = @declaration | @cil_declaration;
+@dotnet_member = @member | @cil_member;
+@dotnet_event = @event | @cil_event;
+@dotnet_property = @property | @cil_property | @indexer;
+@dotnet_parameterizable = @parameterizable | @cil_parameterizable;
+
+// Common types
+@dotnet_type = @type | @cil_type;
+@dotnet_call = @call | @cil_call_any;
+@dotnet_throw = @throw_element | @cil_throw_any;
+@dotnet_valueorreftype = @cil_valueorreftype | @value_or_ref_type | @cil_array_type | @void_type;
+@dotnet_typeparameter = @type_parameter | @cil_typeparameter;
+@dotnet_array_type = @array_type | @cil_array_type;
+@dotnet_pointer_type = @pointer_type | @cil_pointer_type;
+@dotnet_type_parameter = @type_parameter | @cil_typeparameter;
+@dotnet_generic = @dotnet_valueorreftype | @dotnet_callable;
+
+// Attributes
+@dotnet_attribute = @attribute | @cil_attribute;
+
+// Expressions
+@dotnet_expr = @expr | @cil_expr;
+
+// Literals
+@dotnet_literal = @literal_expr | @cil_literal;
+@dotnet_string_literal = @string_literal_expr | @cil_ldstr;
+@dotnet_int_literal = @integer_literal_expr | @cil_ldc_i;
+@dotnet_float_literal = @float_literal_expr | @cil_ldc_r;
+@dotnet_null_literal = @null_literal_expr | @cil_ldnull;
+
+@metadata_entity = @cil_method | @cil_type | @cil_field | @cil_property | @field | @property |
+    @callable | @value_or_ref_type | @void_type;
+
+#keyset[entity, location]
+metadata_handle(int entity : @metadata_entity ref, int location: @assembly ref, int handle: int ref)
diff --git a/csharp/ql/lib/upgrades/83aca6b3e4fa38dd2b97b9b51dfc199a2ba9c7f2/semmlecode.csharp.dbscheme b/csharp/ql/lib/upgrades/83aca6b3e4fa38dd2b97b9b51dfc199a2ba9c7f2/semmlecode.csharp.dbscheme
new file mode 100644
index 00000000000..d0fba103f7d
--- /dev/null
+++ b/csharp/ql/lib/upgrades/83aca6b3e4fa38dd2b97b9b51dfc199a2ba9c7f2/semmlecode.csharp.dbscheme
@@ -0,0 +1,2069 @@
+/* This is a dummy line to alter the dbscheme, so we can make a database upgrade
+ * without actually changing any of the dbscheme predicates. It contains a date
+ * to allow for such updates in the future as well.
+ *
+ * 2021-07-14
+ *
+ * DO NOT remove this comment carelessly, since it can revert the dbscheme back to a
+ * previously seen state (matching a previously seen SHA), which would make the upgrade
+ * mechanism not work properly.
+ */
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    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
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | --compiler
+ * 1   | *path to compiler*
+ * 2   | f1.cs
+ * 3   | f2.cs
+ * 4   | f3.cs
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.cs
+ * 1   | f2.cs
+ * 2   | f3.cs
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The references used by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs /r:ref1.dll /r:ref2.dll /r:ref3.dll
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | ref1.dll
+ * 1   | ref2.dll
+ * 2   | ref3.dll
+ */
+#keyset[id, num]
+compilation_referencing_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(
+    unique int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location_default ref
+);
+
+extractor_messages(
+    unique int id: @extractor_message,
+    int severity: int ref,
+    string origin : string ref,
+    string text : string ref,
+    string entity : string ref,
+    int location: @location_default ref,
+    string stack_trace : string 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
+);
+
+compilation_assembly(
+  unique int id : @compilation ref,
+  int assembly: @assembly ref
+)
+
+// Populated by the CSV extractor
+externalData(
+   int id: @externalDataElement,
+   string path: string ref,
+   int column: int ref,
+   string value: string ref);
+
+sourceLocationPrefix(
+  string prefix: string ref);
+
+/*
+ * C# dbscheme
+ */
+
+/** ELEMENTS **/
+
+@element = @declaration | @stmt | @expr | @modifier | @attribute | @namespace_declaration
+         | @using_directive | @type_parameter_constraints | @externalDataElement
+         | @xmllocatable | @asp_element | @namespace | @preprocessor_directive;
+
+@declaration = @callable | @generic | @assignable | @namespace;
+
+@named_element = @namespace | @declaration;
+
+@declaration_with_accessors = @property | @indexer | @event;
+
+@assignable = @variable | @assignable_with_accessors | @event;
+
+@assignable_with_accessors = @property | @indexer;
+
+@attributable = @assembly | @field | @parameter | @operator | @method | @constructor
+              | @destructor | @callable_accessor | @value_or_ref_type | @declaration_with_accessors
+              | @local_function | @lambda_expr;
+
+/** LOCATIONS, ASEMMBLIES, MODULES, FILES and FOLDERS **/
+
+@location = @location_default | @assembly;
+
+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);
+
+locations_mapped(
+  unique int id: @location_default ref,
+  int mapped_to: @location_default ref);
+
+@sourceline = @file | @callable | @xmllocatable;
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref);
+
+assemblies(
+  unique int id: @assembly,
+  int file: @file ref,
+  string fullname: string ref,
+  string name: string ref,
+  string version: string ref);
+
+files(
+  unique int id: @file,
+  string name: string ref);
+
+folders(
+  unique int id: @folder,
+  string name: string ref);
+
+@container = @folder | @file ;
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref);
+
+file_extraction_mode(
+  unique int file: @file ref,
+  int mode: int ref
+  /* 0 = normal, 1 = standalone extractor */
+  );
+
+/** NAMESPACES **/
+
+@type_container = @namespace | @type;
+
+namespaces(
+  unique int id: @namespace,
+  string name: string ref);
+
+namespace_declarations(
+  unique int id: @namespace_declaration,
+  int namespace_id: @namespace ref);
+
+namespace_declaration_location(
+  unique int id: @namespace_declaration ref,
+  int loc: @location ref);
+
+parent_namespace(
+  unique int child_id: @type_container ref,
+  int namespace_id: @namespace ref);
+
+@declaration_or_directive = @namespace_declaration | @type | @using_directive;
+
+parent_namespace_declaration(
+  int child_id: @declaration_or_directive ref, // cannot be unique because of partial classes
+  int namespace_id: @namespace_declaration ref);
+
+@using_directive = @using_namespace_directive | @using_static_directive;
+
+using_global(
+  unique int id: @using_directive ref
+);
+
+using_namespace_directives(
+  unique int id: @using_namespace_directive,
+  int namespace_id: @namespace ref);
+
+using_static_directives(
+  unique int id: @using_static_directive,
+  int type_id: @type_or_ref ref);
+
+using_directive_location(
+  unique int id: @using_directive ref,
+  int loc: @location ref);
+
+@preprocessor_directive = @pragma_warning | @pragma_checksum | @directive_define | @directive_undefine | @directive_warning
+  | @directive_error | @directive_nullable | @directive_line | @directive_region | @directive_endregion | @directive_if
+  | @directive_elif | @directive_else | @directive_endif;
+
+@conditional_directive = @directive_if | @directive_elif;
+@branch_directive = @directive_if | @directive_elif | @directive_else;
+
+directive_ifs(
+  unique int id: @directive_if,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref); /* 0: false, 1: true */
+
+directive_elifs(
+  unique int id: @directive_elif,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref,  /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+directive_elses(
+  unique int id: @directive_else,
+  int branchTaken: int ref,   /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+#keyset[id, start]
+directive_endifs(
+  unique int id: @directive_endif,
+  unique int start: @directive_if ref);
+
+directive_define_symbols(
+  unique int id: @define_symbol_expr ref,
+  string name: string ref);
+
+directive_regions(
+  unique int id: @directive_region,
+  string name: string ref);
+
+#keyset[id, start]
+directive_endregions(
+  unique int id: @directive_endregion,
+  unique int start: @directive_region ref);
+
+directive_lines(
+  unique int id: @directive_line,
+  int kind: int ref); /* 0: default, 1: hidden, 2: numeric, 3: span */
+
+directive_line_value(
+  unique int id: @directive_line ref,
+  int line: int ref);
+
+directive_line_file(
+  unique int id: @directive_line ref,
+  int file: @file ref);
+
+directive_line_offset(
+  unique int id: @directive_line ref,
+  int offset: int ref);
+
+directive_line_span(
+  unique int id: @directive_line ref,
+  int startLine: int ref,
+  int startColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref);
+
+directive_nullables(
+  unique int id: @directive_nullable,
+  int setting: int ref, /* 0: disable, 1: enable, 2: restore */
+  int target: int ref); /* 0: none, 1: annotations, 2: warnings */
+
+directive_warnings(
+  unique int id: @directive_warning,
+  string message: string ref);
+
+directive_errors(
+  unique int id: @directive_error,
+  string message: string ref);
+
+directive_undefines(
+  unique int id: @directive_undefine,
+  string name: string ref);
+
+directive_defines(
+  unique int id: @directive_define,
+  string name: string ref);
+
+pragma_checksums(
+  unique int id: @pragma_checksum,
+  int file: @file ref,
+  string guid: string ref,
+  string bytes: string ref);
+
+pragma_warnings(
+  unique int id: @pragma_warning,
+  int kind: int ref /* 0 = disable, 1 = restore */);
+
+#keyset[id, index]
+pragma_warning_error_codes(
+  int id: @pragma_warning ref,
+  string errorCode: string ref,
+  int index: int ref);
+
+preprocessor_directive_location(
+  unique int id: @preprocessor_directive ref,
+  int loc: @location ref);
+
+preprocessor_directive_compilation(
+  unique int id: @preprocessor_directive ref,
+  int compilation: @compilation ref);
+
+preprocessor_directive_active(
+  unique int id: @preprocessor_directive ref,
+  int active: int ref);  /* 0: false, 1: true */
+
+/** TYPES **/
+
+types(
+  unique int id: @type,
+  int kind: int ref,
+  string name: string ref);
+
+case @type.kind of
+   1 = @bool_type
+|  2 = @char_type
+|  3 = @decimal_type
+|  4 = @sbyte_type
+|  5 = @short_type
+|  6 = @int_type
+|  7 = @long_type
+|  8 = @byte_type
+|  9 = @ushort_type
+| 10 = @uint_type
+| 11 = @ulong_type
+| 12 = @float_type
+| 13 = @double_type
+| 14 = @enum_type
+| 15 = @struct_type
+| 17 = @class_type
+| 19 = @interface_type
+| 20 = @delegate_type
+| 21 = @null_type
+| 22 = @type_parameter
+| 23 = @pointer_type
+| 24 = @nullable_type
+| 25 = @array_type
+| 26 = @void_type
+| 27 = @int_ptr_type
+| 28 = @uint_ptr_type
+| 29 = @dynamic_type
+| 30 = @arglist_type
+| 31 = @unknown_type
+| 32 = @tuple_type
+| 33 = @function_pointer_type
+  ;
+
+@simple_type = @bool_type | @char_type | @integral_type | @floating_point_type | @decimal_type;
+@integral_type = @signed_integral_type | @unsigned_integral_type;
+@signed_integral_type = @sbyte_type | @short_type | @int_type | @long_type;
+@unsigned_integral_type = @byte_type  | @ushort_type | @uint_type | @ulong_type;
+@floating_point_type = @float_type | @double_type;
+@value_type = @simple_type | @enum_type | @struct_type | @nullable_type | @int_ptr_type
+            | @uint_ptr_type | @tuple_type;
+@ref_type = @class_type | @interface_type | @array_type | @delegate_type | @null_type
+          | @dynamic_type;
+@value_or_ref_type = @value_type | @ref_type;
+
+typerefs(
+  unique int id: @typeref,
+  string name: string ref);
+
+typeref_type(
+  int id: @typeref ref,
+  unique int typeId: @type ref);
+
+@type_or_ref = @type | @typeref;
+
+array_element_type(
+  unique int array: @array_type ref,
+  int dimension: int ref,
+  int rank: int ref,
+  int element: @type_or_ref ref);
+
+nullable_underlying_type(
+  unique int nullable: @nullable_type ref,
+  int underlying: @type_or_ref ref);
+
+pointer_referent_type(
+  unique int pointer: @pointer_type ref,
+  int referent: @type_or_ref ref);
+
+enum_underlying_type(
+  unique int enum_id: @enum_type ref,
+  int underlying_type_id: @type_or_ref ref);
+
+delegate_return_type(
+  unique int delegate_id: @delegate_type ref,
+  int return_type_id: @type_or_ref ref);
+
+function_pointer_return_type(
+    unique int function_pointer_id: @function_pointer_type ref,
+    int return_type_id: @type_or_ref ref);
+
+extend(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+anonymous_types(
+  unique int id: @type ref);
+
+@interface_or_ref = @interface_type | @typeref;
+
+implement(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+type_location(
+  int id: @type ref,
+  int loc: @location ref);
+
+tuple_underlying_type(
+  unique int tuple: @tuple_type ref,
+  int struct: @type_or_ref ref);
+
+#keyset[tuple, index]
+tuple_element(
+  int tuple: @tuple_type ref,
+  int index: int ref,
+  unique int field: @field ref);
+
+attributes(
+  unique int id: @attribute,
+  int kind: int ref,
+  int type_id: @type_or_ref ref,
+  int target:  @attributable ref);
+
+case @attribute.kind of
+  0 = @attribute_default
+| 1 = @attribute_return
+| 2 = @attribute_assembly
+| 3 = @attribute_module
+;
+
+attribute_location(
+  int id: @attribute ref,
+  int loc: @location ref);
+
+@type_mention_parent = @element | @type_mention;
+
+type_mention(
+  unique int id: @type_mention,
+  int type_id: @type_or_ref ref,
+  int parent: @type_mention_parent ref);
+
+type_mention_location(
+  unique int id: @type_mention ref,
+  int loc: @location ref);
+
+@has_type_annotation = @assignable | @type_parameter | @callable | @expr | @delegate_type | @generic | @function_pointer_type;
+
+/**
+ * A direct annotation on an entity, for example `string? x;`.
+ *
+ * Annotations:
+ * 2 = reftype is not annotated "!"
+ * 3 = reftype is annotated "?"
+ * 4 = readonly ref type / in parameter
+ * 5 = ref type parameter, return or local variable
+ * 6 = out parameter
+ *
+ * Note that the annotation depends on the element it annotates.
+ * @assignable: The annotation is on the type of the assignable, for example the variable type.
+ * @type_parameter: The annotation is on the reftype constraint
+ * @callable: The annotation is on the return type
+ * @array_type: The annotation is on the element type
+ */
+type_annotation(int id: @has_type_annotation ref, int annotation: int ref);
+
+nullability(unique int nullability: @nullability, int kind: int ref);
+
+case @nullability.kind of
+  0 = @oblivious
+| 1 = @not_annotated
+| 2 = @annotated
+;
+
+#keyset[parent, index]
+nullability_parent(int nullability: @nullability ref, int index: int ref, int parent: @nullability ref)
+
+type_nullability(int id: @has_type_annotation ref, int nullability: @nullability ref);
+
+/**
+ * The nullable flow state of an expression, as determined by Roslyn.
+ *   0 = none (default, not populated)
+ *   1 = not null
+ *   2 = maybe null
+ */
+expr_flowstate(unique int id: @expr ref, int state: int ref);
+
+/** GENERICS **/
+
+@generic = @type | @method | @local_function;
+
+type_parameters(
+  unique int id: @type_parameter ref,
+  int index: int ref,
+  int generic_id: @generic ref,
+  int variance: int ref /* none = 0, out = 1, in = 2 */);
+
+#keyset[constructed_id, index]
+type_arguments(
+  int id: @type_or_ref ref,
+  int index: int ref,
+  int constructed_id: @generic_or_ref ref);
+
+@generic_or_ref = @generic | @typeref;
+
+constructed_generic(
+  unique int constructed: @generic ref,
+  int generic: @generic_or_ref ref);
+
+type_parameter_constraints(
+  unique int id: @type_parameter_constraints,
+  int param_id: @type_parameter ref);
+
+type_parameter_constraints_location(
+  int id: @type_parameter_constraints ref,
+  int loc: @location ref);
+
+general_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int kind: int ref /* class = 1, struct = 2, new = 3 */);
+
+specific_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref);
+
+specific_type_parameter_nullability(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref,
+  int nullability: @nullability ref);
+
+/** FUNCTION POINTERS */
+
+function_pointer_calling_conventions(
+  int id: @function_pointer_type ref,
+  int kind: int ref);
+
+#keyset[id, index]
+has_unmanaged_calling_conventions(
+  int id: @function_pointer_type ref,
+  int index: int ref,
+  int conv_id: @type_or_ref ref);
+
+/** MODIFIERS */
+
+@modifiable = @modifiable_direct | @event_accessor;
+
+@modifiable_direct = @member | @accessor | @local_function | @anonymous_function_expr;
+
+modifiers(
+  unique int id: @modifier,
+  string name: string ref);
+
+has_modifiers(
+  int id: @modifiable_direct ref,
+  int mod_id: @modifier ref);
+
+compiler_generated(unique int id: @modifiable ref);
+
+/** MEMBERS **/
+
+@member = @method | @constructor | @destructor | @field | @property | @event | @operator | @indexer | @type;
+
+@named_exprorstmt = @goto_stmt | @labeled_stmt | @expr;
+
+@virtualizable = @method | @property | @indexer | @event;
+
+exprorstmt_name(
+  unique int parent_id: @named_exprorstmt ref,
+  string name: string ref);
+
+nested_types(
+  unique int id: @type ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @type ref);
+
+properties(
+  unique int id: @property,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @property ref);
+
+property_location(
+  int id: @property ref,
+  int loc: @location ref);
+
+indexers(
+  unique int id: @indexer,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @indexer ref);
+
+indexer_location(
+  int id: @indexer ref,
+  int loc: @location ref);
+
+accessors(
+  unique int id: @accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_member_id: @member ref,
+  int unbound_id: @accessor ref);
+
+case @accessor.kind of
+  1 = @getter
+| 2 = @setter
+  ;
+
+init_only_accessors(
+  unique int id: @accessor ref);
+
+accessor_location(
+  int id: @accessor ref,
+  int loc: @location ref);
+
+events(
+  unique int id: @event,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @event ref);
+
+event_location(
+  int id: @event ref,
+  int loc: @location ref);
+
+event_accessors(
+  unique int id: @event_accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_event_id: @event ref,
+  int unbound_id: @event_accessor ref);
+
+case @event_accessor.kind of
+  1 = @add_event_accessor
+| 2 = @remove_event_accessor
+  ;
+
+event_accessor_location(
+  int id: @event_accessor ref,
+  int loc: @location ref);
+
+operators(
+  unique int id: @operator,
+  string name: string ref,
+  string symbol: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @operator ref);
+
+operator_location(
+  int id: @operator ref,
+  int loc: @location ref);
+
+constant_value(
+  int id: @variable ref,
+  string value: string ref);
+
+/** CALLABLES **/
+
+@callable = @method | @constructor | @destructor | @operator | @callable_accessor | @anonymous_function_expr | @local_function;
+
+@callable_accessor = @accessor | @event_accessor;
+
+methods(
+  unique int id: @method,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @method ref);
+
+method_location(
+  int id: @method ref,
+  int loc: @location ref);
+
+constructors(
+  unique int id: @constructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @constructor ref);
+
+constructor_location(
+  int id: @constructor ref,
+  int loc: @location ref);
+
+destructors(
+  unique int id: @destructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @destructor ref);
+
+destructor_location(
+  int id: @destructor ref,
+  int loc: @location ref);
+
+overrides(
+  int id: @callable ref,
+  int base_id: @callable ref);
+
+explicitly_implements(
+  int id: @member ref,
+  int interface_id: @interface_or_ref ref);
+
+local_functions(
+    unique int id: @local_function,
+    string name: string ref,
+    int return_type: @type ref,
+    int unbound_id: @local_function ref);
+
+local_function_stmts(
+    unique int fn: @local_function_stmt ref,
+    int stmt: @local_function ref);
+
+/** VARIABLES **/
+
+@variable = @local_scope_variable | @field;
+
+@local_scope_variable = @local_variable | @parameter;
+
+fields(
+  unique int id: @field,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @field ref);
+
+case @field.kind of
+  1 = @addressable_field
+| 2 = @constant
+  ;
+
+field_location(
+  int id: @field ref,
+  int loc: @location ref);
+
+localvars(
+  unique int id: @local_variable,
+  int kind: int ref,
+  string name: string ref,
+  int implicitly_typed: int ref /* 0 = no, 1 = yes */,
+  int type_id: @type_or_ref ref,
+  int parent_id: @local_var_decl_expr ref);
+
+case @local_variable.kind of
+  1 = @addressable_local_variable
+| 2 = @local_constant
+| 3 = @local_variable_ref
+  ;
+
+localvar_location(
+  unique int id: @local_variable ref,
+  int loc: @location ref);
+
+@parameterizable = @callable | @delegate_type | @indexer | @function_pointer_type;
+
+#keyset[name, parent_id]
+#keyset[index, parent_id]
+params(
+  unique int id: @parameter,
+  string name: string ref,
+  int type_id: @type_or_ref ref,
+  int index: int ref,
+  int mode: int ref, /* value = 0, ref = 1, out = 2, array = 3, this = 4 */
+  int parent_id: @parameterizable ref,
+  int unbound_id: @parameter ref);
+
+param_location(
+  int id: @parameter ref,
+  int loc: @location ref);
+
+/** STATEMENTS **/
+
+@exprorstmt_parent = @control_flow_element | @top_level_exprorstmt_parent;
+
+statements(
+  unique int id: @stmt,
+  int kind: int ref);
+
+#keyset[index, parent]
+stmt_parent(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_stmt_parent = @callable;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+stmt_parent_top_level(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @top_level_stmt_parent ref);
+
+case @stmt.kind of
+   1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @switch_stmt
+|  5 = @while_stmt
+|  6 = @do_stmt
+|  7 = @for_stmt
+|  8 = @foreach_stmt
+|  9 = @break_stmt
+| 10 = @continue_stmt
+| 11 = @goto_stmt
+| 12 = @goto_case_stmt
+| 13 = @goto_default_stmt
+| 14 = @throw_stmt
+| 15 = @return_stmt
+| 16 = @yield_stmt
+| 17 = @try_stmt
+| 18 = @checked_stmt
+| 19 = @unchecked_stmt
+| 20 = @lock_stmt
+| 21 = @using_block_stmt
+| 22 = @var_decl_stmt
+| 23 = @const_decl_stmt
+| 24 = @empty_stmt
+| 25 = @unsafe_stmt
+| 26 = @fixed_stmt
+| 27 = @label_stmt
+| 28 = @catch
+| 29 = @case_stmt
+| 30 = @local_function_stmt
+| 31 = @using_decl_stmt
+  ;
+
+@using_stmt = @using_block_stmt | @using_decl_stmt;
+
+@labeled_stmt = @label_stmt | @case;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @using_decl_stmt;
+
+@cond_stmt = @if_stmt | @switch_stmt;
+
+@loop_stmt = @while_stmt | @do_stmt | @for_stmt | @foreach_stmt;
+
+@jump_stmt = @break_stmt | @goto_any_stmt | @continue_stmt | @throw_stmt | @return_stmt
+           | @yield_stmt;
+
+@goto_any_stmt = @goto_default_stmt | @goto_case_stmt | @goto_stmt;
+
+
+stmt_location(
+  unique int id: @stmt ref,
+  int loc: @location ref);
+
+catch_type(
+  unique int catch_id: @catch ref,
+  int type_id: @type_or_ref ref,
+  int kind: int ref /* explicit = 1, implicit = 2 */);
+
+foreach_stmt_info(
+  unique int id: @foreach_stmt ref,
+  int kind: int ref /* non-async = 1, async = 2 */);
+
+@foreach_symbol =  @method | @property | @type_or_ref;
+
+#keyset[id, kind]
+foreach_stmt_desugar(
+  int id: @foreach_stmt ref,
+  int symbol: @foreach_symbol ref,
+  int kind: int ref /* GetEnumeratorMethod = 1, CurrentProperty = 2, MoveNextMethod = 3, DisposeMethod = 4, ElementType = 5 */);
+
+/** EXPRESSIONS **/
+
+expressions(
+  unique int id: @expr,
+  int kind: int ref,
+  int type_id: @type_or_ref ref);
+
+#keyset[index, parent]
+expr_parent(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_expr_parent = @attribute | @field | @property | @indexer | @parameter | @directive_if | @directive_elif;
+
+@top_level_exprorstmt_parent = @top_level_expr_parent | @top_level_stmt_parent;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+expr_parent_top_level(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @top_level_exprorstmt_parent ref);
+
+case @expr.kind of
+/* literal */
+   1 = @bool_literal_expr
+|  2 = @char_literal_expr
+|  3 = @decimal_literal_expr
+|  4 = @int_literal_expr
+|  5 = @long_literal_expr
+|  6 = @uint_literal_expr
+|  7 = @ulong_literal_expr
+|  8 = @float_literal_expr
+|  9 = @double_literal_expr
+| 10 = @string_literal_expr
+| 11 = @null_literal_expr
+/* primary & unary */
+| 12 = @this_access_expr
+| 13 = @base_access_expr
+| 14 = @local_variable_access_expr
+| 15 = @parameter_access_expr
+| 16 = @field_access_expr
+| 17 = @property_access_expr
+| 18 = @method_access_expr
+| 19 = @event_access_expr
+| 20 = @indexer_access_expr
+| 21 = @array_access_expr
+| 22 = @type_access_expr
+| 23 = @typeof_expr
+| 24 = @method_invocation_expr
+| 25 = @delegate_invocation_expr
+| 26 = @operator_invocation_expr
+| 27 = @cast_expr
+| 28 = @object_creation_expr
+| 29 = @explicit_delegate_creation_expr
+| 30 = @implicit_delegate_creation_expr
+| 31 = @array_creation_expr
+| 32 = @default_expr
+| 33 = @plus_expr
+| 34 = @minus_expr
+| 35 = @bit_not_expr
+| 36 = @log_not_expr
+| 37 = @post_incr_expr
+| 38 = @post_decr_expr
+| 39 = @pre_incr_expr
+| 40 = @pre_decr_expr
+/* multiplicative */
+| 41 = @mul_expr
+| 42 = @div_expr
+| 43 = @rem_expr
+/* additive */
+| 44 = @add_expr
+| 45 = @sub_expr
+/* shift */
+| 46 = @lshift_expr
+| 47 = @rshift_expr
+/* relational */
+| 48 = @lt_expr
+| 49 = @gt_expr
+| 50 = @le_expr
+| 51 = @ge_expr
+/* equality */
+| 52 = @eq_expr
+| 53 = @ne_expr
+/* logical */
+| 54 = @bit_and_expr
+| 55 = @bit_xor_expr
+| 56 = @bit_or_expr
+| 57 = @log_and_expr
+| 58 = @log_or_expr
+/* type testing */
+| 59 = @is_expr
+| 60 = @as_expr
+/* null coalescing */
+| 61 = @null_coalescing_expr
+/* conditional */
+| 62 = @conditional_expr
+/* assignment */
+| 63 = @simple_assign_expr
+| 64 = @assign_add_expr
+| 65 = @assign_sub_expr
+| 66 = @assign_mul_expr
+| 67 = @assign_div_expr
+| 68 = @assign_rem_expr
+| 69 = @assign_and_expr
+| 70 = @assign_xor_expr
+| 71 = @assign_or_expr
+| 72 = @assign_lshift_expr
+| 73 = @assign_rshift_expr
+/* more */
+| 74 = @object_init_expr
+| 75 = @collection_init_expr
+| 76 = @array_init_expr
+| 77 = @checked_expr
+| 78 = @unchecked_expr
+| 79 = @constructor_init_expr
+| 80 = @add_event_expr
+| 81 = @remove_event_expr
+| 82 = @par_expr
+| 83 = @local_var_decl_expr
+| 84 = @lambda_expr
+| 85 = @anonymous_method_expr
+| 86 = @namespace_expr
+/* dynamic */
+| 92 = @dynamic_element_access_expr
+| 93 = @dynamic_member_access_expr
+/* unsafe */
+| 100 = @pointer_indirection_expr
+| 101 = @address_of_expr
+| 102 = @sizeof_expr
+/* async */
+| 103 = @await_expr
+/* C# 6.0 */
+| 104 = @nameof_expr
+| 105 = @interpolated_string_expr
+| 106 = @unknown_expr
+/* C# 7.0 */
+| 107 = @throw_expr
+| 108 = @tuple_expr
+| 109 = @local_function_invocation_expr
+| 110 = @ref_expr
+| 111 = @discard_expr
+/* C# 8.0 */
+| 112 = @range_expr
+| 113 = @index_expr
+| 114 = @switch_expr
+| 115 = @recursive_pattern_expr
+| 116 = @property_pattern_expr
+| 117 = @positional_pattern_expr
+| 118 = @switch_case_expr
+| 119 = @assign_coalesce_expr
+| 120 = @suppress_nullable_warning_expr
+| 121 = @namespace_access_expr
+/* C# 9.0 */
+| 122 = @lt_pattern_expr
+| 123 = @gt_pattern_expr
+| 124 = @le_pattern_expr
+| 125 = @ge_pattern_expr
+| 126 = @not_pattern_expr
+| 127 = @and_pattern_expr
+| 128 = @or_pattern_expr
+| 129 = @function_pointer_invocation_expr
+| 130 = @with_expr
+/* C# 11.0 */
+| 131 = @list_pattern_expr
+| 132 = @slice_pattern_expr
+| 133 = @urshift_expr
+| 134 = @assign_urshift_expr
+/* Preprocessor */
+| 999 = @define_symbol_expr
+;
+
+@switch = @switch_stmt | @switch_expr;
+@case = @case_stmt | @switch_case_expr;
+@pattern_match = @case | @is_expr;
+@unary_pattern_expr = @not_pattern_expr;
+@relational_pattern_expr = @gt_pattern_expr | @lt_pattern_expr | @ge_pattern_expr | @le_pattern_expr;
+@binary_pattern_expr = @and_pattern_expr | @or_pattern_expr;
+
+@integer_literal_expr = @int_literal_expr | @long_literal_expr | @uint_literal_expr | @ulong_literal_expr;
+@real_literal_expr = @float_literal_expr | @double_literal_expr | @decimal_literal_expr;
+@literal_expr = @bool_literal_expr | @char_literal_expr | @integer_literal_expr | @real_literal_expr
+              | @string_literal_expr | @null_literal_expr;
+
+@assign_expr = @simple_assign_expr | @assign_op_expr | @local_var_decl_expr;
+@assign_op_expr =  @assign_arith_expr | @assign_bitwise_expr | @assign_event_expr | @assign_coalesce_expr;
+@assign_event_expr = @add_event_expr | @remove_event_expr;
+
+@assign_arith_expr = @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr
+                   | @assign_rem_expr
+@assign_bitwise_expr = @assign_and_expr | @assign_or_expr | @assign_xor_expr
+                   | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr;
+
+@member_access_expr = @field_access_expr | @property_access_expr | @indexer_access_expr | @event_access_expr
+                    | @method_access_expr | @type_access_expr | @dynamic_member_access_expr;
+@access_expr = @member_access_expr | @this_access_expr | @base_access_expr | @assignable_access_expr | @namespace_access_expr;
+@element_access_expr = @indexer_access_expr | @array_access_expr | @dynamic_element_access_expr;
+
+@local_variable_access = @local_variable_access_expr | @local_var_decl_expr;
+@local_scope_variable_access_expr = @parameter_access_expr | @local_variable_access;
+@variable_access_expr = @local_scope_variable_access_expr | @field_access_expr;
+
+@assignable_access_expr = @variable_access_expr | @property_access_expr | @element_access_expr
+                        | @event_access_expr | @dynamic_member_access_expr;
+
+@objectorcollection_init_expr = @object_init_expr | @collection_init_expr;
+
+@delegate_creation_expr = @explicit_delegate_creation_expr | @implicit_delegate_creation_expr;
+
+@bin_arith_op_expr = @mul_expr | @div_expr | @rem_expr | @add_expr | @sub_expr;
+@incr_op_expr =  @pre_incr_expr | @post_incr_expr;
+@decr_op_expr =  @pre_decr_expr | @post_decr_expr;
+@mut_op_expr = @incr_op_expr | @decr_op_expr;
+@un_arith_op_expr = @plus_expr | @minus_expr | @mut_op_expr;
+@arith_op_expr = @bin_arith_op_expr | @un_arith_op_expr;
+
+@ternary_log_op_expr = @conditional_expr;
+@bin_log_op_expr = @log_and_expr | @log_or_expr | @null_coalescing_expr;
+@un_log_op_expr = @log_not_expr;
+@log_expr = @un_log_op_expr | @bin_log_op_expr | @ternary_log_op_expr;
+
+@bin_bit_op_expr =  @bit_and_expr | @bit_or_expr | @bit_xor_expr | @lshift_expr
+                 | @rshift_expr | @urshift_expr;
+@un_bit_op_expr = @bit_not_expr;
+@bit_expr = @un_bit_op_expr | @bin_bit_op_expr;
+
+@equality_op_expr =  @eq_expr | @ne_expr;
+@rel_op_expr = @gt_expr | @lt_expr| @ge_expr | @le_expr;
+@comp_expr = @equality_op_expr | @rel_op_expr;
+
+@op_expr = @assign_expr | @un_op | @bin_op | @ternary_op;
+
+@ternary_op = @ternary_log_op_expr;
+@bin_op = @bin_arith_op_expr | @bin_log_op_expr | @bin_bit_op_expr | @comp_expr;
+@un_op = @un_arith_op_expr | @un_log_op_expr | @un_bit_op_expr | @sizeof_expr
+       | @pointer_indirection_expr | @address_of_expr;
+
+@anonymous_function_expr = @lambda_expr | @anonymous_method_expr;
+
+@call = @method_invocation_expr | @constructor_init_expr | @operator_invocation_expr
+      | @delegate_invocation_expr | @object_creation_expr | @call_access_expr
+      | @local_function_invocation_expr | @function_pointer_invocation_expr;
+
+@call_access_expr = @property_access_expr | @event_access_expr | @indexer_access_expr;
+
+@late_bindable_expr = @dynamic_element_access_expr | @dynamic_member_access_expr
+                    | @object_creation_expr | @method_invocation_expr | @operator_invocation_expr;
+
+@throw_element = @throw_expr | @throw_stmt;
+
+@implicitly_typeable_object_creation_expr = @object_creation_expr | @explicit_delegate_creation_expr;
+
+implicitly_typed_array_creation(
+  unique int id: @array_creation_expr ref);
+
+explicitly_sized_array_creation(
+  unique int id: @array_creation_expr ref);
+
+stackalloc_array_creation(
+  unique int id: @array_creation_expr ref);
+
+implicitly_typed_object_creation(
+  unique int id: @implicitly_typeable_object_creation_expr ref);
+
+mutator_invocation_mode(
+  unique int id: @operator_invocation_expr ref,
+  int mode: int ref /* prefix = 1, postfix = 2*/);
+
+expr_compiler_generated(
+  unique int id: @expr ref);
+
+expr_value(
+  unique int id: @expr ref,
+  string value: string ref);
+
+expr_call(
+  unique int caller_id: @expr ref,
+  int target_id: @callable ref);
+
+expr_access(
+  unique int accesser_id: @access_expr ref,
+  int target_id: @accessible ref);
+
+@accessible = @method | @assignable | @local_function | @namespace;
+
+expr_location(
+  unique int id: @expr ref,
+  int loc: @location ref);
+
+dynamic_member_name(
+  unique int id: @late_bindable_expr ref,
+  string name: string ref);
+
+@qualifiable_expr = @member_access_expr
+                  | @method_invocation_expr
+                  | @element_access_expr;
+
+conditional_access(
+  unique int id: @qualifiable_expr ref);
+
+expr_argument(
+  unique int id: @expr ref,
+  int mode: int ref);
+  /* mode is the same as params: value = 0, ref = 1, out = 2 */
+
+expr_argument_name(
+  unique int id: @expr ref,
+  string name: string ref);
+
+lambda_expr_return_type(
+  unique int id: @lambda_expr ref,
+  int type_id: @type_or_ref ref);
+  
+/** CONTROL/DATA FLOW **/
+
+@control_flow_element = @stmt | @expr;
+
+/* 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;
+
+/* Comments */
+
+commentline(
+  unique int id: @commentline,
+  int kind: int ref,
+  string text: string ref,
+  string rawtext: string ref);
+
+case @commentline.kind of
+  0 = @singlelinecomment
+| 1 = @xmldoccomment
+| 2 = @multilinecomment;
+
+commentline_location(
+  unique int id: @commentline ref,
+  int loc: @location ref);
+
+commentblock(
+  unique int id : @commentblock);
+
+commentblock_location(
+  unique int id: @commentblock ref,
+  int loc: @location ref);
+
+commentblock_binding(
+  int id: @commentblock ref,
+  int entity: @element ref,
+  int bindtype: int ref);    /* 0: Parent, 1: Best, 2: Before, 3: After */
+
+commentblock_child(
+  int id: @commentblock ref,
+  int commentline: @commentline ref,
+  int index: int ref);
+
+/* ASP.NET */
+
+case @asp_element.kind of
+  0=@asp_close_tag
+| 1=@asp_code
+| 2=@asp_comment
+| 3=@asp_data_binding
+| 4=@asp_directive
+| 5=@asp_open_tag
+| 6=@asp_quoted_string
+| 7=@asp_text
+| 8=@asp_xml_directive;
+
+@asp_attribute = @asp_code | @asp_data_binding | @asp_quoted_string;
+
+asp_elements(
+  unique int id: @asp_element,
+  int kind: int ref,
+  int loc: @location ref);
+
+asp_comment_server(unique int comment: @asp_comment ref);
+asp_code_inline(unique int code: @asp_code ref);
+asp_directive_attribute(
+  int directive: @asp_directive ref,
+  int index: int ref,
+  string name: string ref,
+  int value: @asp_quoted_string ref);
+asp_directive_name(
+  unique int directive: @asp_directive ref,
+  string name: string ref);
+asp_element_body(
+  unique int element: @asp_element ref,
+  string body: string ref);
+asp_tag_attribute(
+  int tag: @asp_open_tag ref,
+  int index: int ref,
+  string name: string ref,
+  int attribute: @asp_attribute ref);
+asp_tag_name(
+  unique int tag: @asp_open_tag ref,
+  string name: string ref);
+asp_tag_isempty(int tag: @asp_open_tag ref);
+
+/* Common Intermediate Language - CIL */
+
+case @cil_instruction.opcode of
+  0 = @cil_nop
+| 1 = @cil_break
+| 2 = @cil_ldarg_0
+| 3 = @cil_ldarg_1
+| 4 = @cil_ldarg_2
+| 5 = @cil_ldarg_3
+| 6 = @cil_ldloc_0
+| 7 = @cil_ldloc_1
+| 8 = @cil_ldloc_2
+| 9 = @cil_ldloc_3
+| 10 = @cil_stloc_0
+| 11 = @cil_stloc_1
+| 12 = @cil_stloc_2
+| 13 = @cil_stloc_3
+| 14 = @cil_ldarg_s
+| 15 = @cil_ldarga_s
+| 16 = @cil_starg_s
+| 17 = @cil_ldloc_s
+| 18 = @cil_ldloca_s
+| 19 = @cil_stloc_s
+| 20 = @cil_ldnull
+| 21 = @cil_ldc_i4_m1
+| 22 = @cil_ldc_i4_0
+| 23 = @cil_ldc_i4_1
+| 24 = @cil_ldc_i4_2
+| 25 = @cil_ldc_i4_3
+| 26 = @cil_ldc_i4_4
+| 27 = @cil_ldc_i4_5
+| 28 = @cil_ldc_i4_6
+| 29 = @cil_ldc_i4_7
+| 30 = @cil_ldc_i4_8
+| 31 = @cil_ldc_i4_s
+| 32 = @cil_ldc_i4
+| 33 = @cil_ldc_i8
+| 34 = @cil_ldc_r4
+| 35 = @cil_ldc_r8
+| 37 = @cil_dup
+| 38 = @cil_pop
+| 39 = @cil_jmp
+| 40 = @cil_call
+| 41 = @cil_calli
+| 42 = @cil_ret
+| 43 = @cil_br_s
+| 44 = @cil_brfalse_s
+| 45 = @cil_brtrue_s
+| 46 = @cil_beq_s
+| 47 = @cil_bge_s
+| 48 = @cil_bgt_s
+| 49 = @cil_ble_s
+| 50 = @cil_blt_s
+| 51 = @cil_bne_un_s
+| 52 = @cil_bge_un_s
+| 53 = @cil_bgt_un_s
+| 54 = @cil_ble_un_s
+| 55 = @cil_blt_un_s
+| 56 = @cil_br
+| 57 = @cil_brfalse
+| 58 = @cil_brtrue
+| 59 = @cil_beq
+| 60 = @cil_bge
+| 61 = @cil_bgt
+| 62 = @cil_ble
+| 63 = @cil_blt
+| 64 = @cil_bne_un
+| 65 = @cil_bge_un
+| 66 = @cil_bgt_un
+| 67 = @cil_ble_un
+| 68 = @cil_blt_un
+| 69 = @cil_switch
+| 70 = @cil_ldind_i1
+| 71 = @cil_ldind_u1
+| 72 = @cil_ldind_i2
+| 73 = @cil_ldind_u2
+| 74 = @cil_ldind_i4
+| 75 = @cil_ldind_u4
+| 76 = @cil_ldind_i8
+| 77 = @cil_ldind_i
+| 78 = @cil_ldind_r4
+| 79 = @cil_ldind_r8
+| 80 = @cil_ldind_ref
+| 81 = @cil_stind_ref
+| 82 = @cil_stind_i1
+| 83 = @cil_stind_i2
+| 84 = @cil_stind_i4
+| 85 = @cil_stind_i8
+| 86 = @cil_stind_r4
+| 87 = @cil_stind_r8
+| 88 = @cil_add
+| 89 = @cil_sub
+| 90 = @cil_mul
+| 91 = @cil_div
+| 92 = @cil_div_un
+| 93 = @cil_rem
+| 94 = @cil_rem_un
+| 95 = @cil_and
+| 96 = @cil_or
+| 97 = @cil_xor
+| 98 = @cil_shl
+| 99 = @cil_shr
+| 100 = @cil_shr_un
+| 101 = @cil_neg
+| 102 = @cil_not
+| 103 = @cil_conv_i1
+| 104 = @cil_conv_i2
+| 105 = @cil_conv_i4
+| 106 = @cil_conv_i8
+| 107 = @cil_conv_r4
+| 108 = @cil_conv_r8
+| 109 = @cil_conv_u4
+| 110 = @cil_conv_u8
+| 111 = @cil_callvirt
+| 112 = @cil_cpobj
+| 113 = @cil_ldobj
+| 114 = @cil_ldstr
+| 115 = @cil_newobj
+| 116 = @cil_castclass
+| 117 = @cil_isinst
+| 118 = @cil_conv_r_un
+| 121 = @cil_unbox
+| 122 = @cil_throw
+| 123 = @cil_ldfld
+| 124 = @cil_ldflda
+| 125 = @cil_stfld
+| 126 = @cil_ldsfld
+| 127 = @cil_ldsflda
+| 128 = @cil_stsfld
+| 129 = @cil_stobj
+| 130 = @cil_conv_ovf_i1_un
+| 131 = @cil_conv_ovf_i2_un
+| 132 = @cil_conv_ovf_i4_un
+| 133 = @cil_conv_ovf_i8_un
+| 134 = @cil_conv_ovf_u1_un
+| 135 = @cil_conv_ovf_u2_un
+| 136 = @cil_conv_ovf_u4_un
+| 137 = @cil_conv_ovf_u8_un
+| 138 = @cil_conv_ovf_i_un
+| 139 = @cil_conv_ovf_u_un
+| 140 = @cil_box
+| 141 = @cil_newarr
+| 142 = @cil_ldlen
+| 143 = @cil_ldelema
+| 144 = @cil_ldelem_i1
+| 145 = @cil_ldelem_u1
+| 146 = @cil_ldelem_i2
+| 147 = @cil_ldelem_u2
+| 148 = @cil_ldelem_i4
+| 149 = @cil_ldelem_u4
+| 150 = @cil_ldelem_i8
+| 151 = @cil_ldelem_i
+| 152 = @cil_ldelem_r4
+| 153 = @cil_ldelem_r8
+| 154 = @cil_ldelem_ref
+| 155 = @cil_stelem_i
+| 156 = @cil_stelem_i1
+| 157 = @cil_stelem_i2
+| 158 = @cil_stelem_i4
+| 159 = @cil_stelem_i8
+| 160 = @cil_stelem_r4
+| 161 = @cil_stelem_r8
+| 162 = @cil_stelem_ref
+| 163 = @cil_ldelem
+| 164 = @cil_stelem
+| 165 = @cil_unbox_any
+| 179 = @cil_conv_ovf_i1
+| 180 = @cil_conv_ovf_u1
+| 181 = @cil_conv_ovf_i2
+| 182 = @cil_conv_ovf_u2
+| 183 = @cil_conv_ovf_i4
+| 184 = @cil_conv_ovf_u4
+| 185 = @cil_conv_ovf_i8
+| 186 = @cil_conv_ovf_u8
+| 194 = @cil_refanyval
+| 195 = @cil_ckinfinite
+| 198 = @cil_mkrefany
+| 208 = @cil_ldtoken
+| 209 = @cil_conv_u2
+| 210 = @cil_conv_u1
+| 211 = @cil_conv_i
+| 212 = @cil_conv_ovf_i
+| 213 = @cil_conv_ovf_u
+| 214 = @cil_add_ovf
+| 215 = @cil_add_ovf_un
+| 216 = @cil_mul_ovf
+| 217 = @cil_mul_ovf_un
+| 218 = @cil_sub_ovf
+| 219 = @cil_sub_ovf_un
+| 220 = @cil_endfinally
+| 221 = @cil_leave
+| 222 = @cil_leave_s
+| 223 = @cil_stind_i
+| 224 = @cil_conv_u
+| 65024 = @cil_arglist
+| 65025 = @cil_ceq
+| 65026 = @cil_cgt
+| 65027 = @cil_cgt_un
+| 65028 = @cil_clt
+| 65029 = @cil_clt_un
+| 65030 = @cil_ldftn
+| 65031 = @cil_ldvirtftn
+| 65033 = @cil_ldarg
+| 65034 = @cil_ldarga
+| 65035 = @cil_starg
+| 65036 = @cil_ldloc
+| 65037 = @cil_ldloca
+| 65038 = @cil_stloc
+| 65039 = @cil_localloc
+| 65041 = @cil_endfilter
+| 65042 = @cil_unaligned
+| 65043 = @cil_volatile
+| 65044 = @cil_tail
+| 65045 = @cil_initobj
+| 65046 = @cil_constrained
+| 65047 = @cil_cpblk
+| 65048 = @cil_initblk
+| 65050 = @cil_rethrow
+| 65052 = @cil_sizeof
+| 65053 = @cil_refanytype
+| 65054 = @cil_readonly
+;
+
+// CIL ignored instructions
+
+@cil_ignore = @cil_nop | @cil_break | @cil_volatile | @cil_unaligned;
+
+// CIL local/parameter/field access
+
+@cil_ldarg_any = @cil_ldarg_0 | @cil_ldarg_1 | @cil_ldarg_2 | @cil_ldarg_3 | @cil_ldarg_s | @cil_ldarga_s | @cil_ldarg | @cil_ldarga;
+@cil_starg_any = @cil_starg | @cil_starg_s;
+
+@cil_ldloc_any = @cil_ldloc_0 | @cil_ldloc_1 | @cil_ldloc_2 | @cil_ldloc_3 | @cil_ldloc_s | @cil_ldloca_s | @cil_ldloc | @cil_ldloca;
+@cil_stloc_any = @cil_stloc_0 | @cil_stloc_1 | @cil_stloc_2 | @cil_stloc_3 | @cil_stloc_s | @cil_stloc;
+
+@cil_ldfld_any = @cil_ldfld | @cil_ldsfld | @cil_ldsflda | @cil_ldflda;
+@cil_stfld_any = @cil_stfld | @cil_stsfld;
+
+@cil_local_access = @cil_stloc_any | @cil_ldloc_any;
+@cil_arg_access = @cil_starg_any | @cil_ldarg_any;
+@cil_read_access = @cil_ldloc_any | @cil_ldarg_any | @cil_ldfld_any;
+@cil_write_access = @cil_stloc_any | @cil_starg_any | @cil_stfld_any;
+
+@cil_stack_access = @cil_local_access | @cil_arg_access;
+@cil_field_access = @cil_ldfld_any | @cil_stfld_any;
+
+@cil_access = @cil_read_access | @cil_write_access;
+
+// CIL constant/literal instructions
+
+@cil_ldc_i = @cil_ldc_i4_any | @cil_ldc_i8;
+
+@cil_ldc_i4_any = @cil_ldc_i4_m1 | @cil_ldc_i4_0 | @cil_ldc_i4_1 | @cil_ldc_i4_2 | @cil_ldc_i4_3 |
+  @cil_ldc_i4_4 | @cil_ldc_i4_5 | @cil_ldc_i4_6 | @cil_ldc_i4_7 | @cil_ldc_i4_8 | @cil_ldc_i4_s | @cil_ldc_i4;
+
+@cil_ldc_r = @cil_ldc_r4 | @cil_ldc_r8;
+
+@cil_literal = @cil_ldnull | @cil_ldc_i | @cil_ldc_r | @cil_ldstr;
+
+// Control flow
+
+@cil_conditional_jump = @cil_binary_jump | @cil_unary_jump;
+@cil_binary_jump = @cil_beq_s | @cil_bge_s | @cil_bgt_s | @cil_ble_s | @cil_blt_s |
+    @cil_bne_un_s | @cil_bge_un_s | @cil_bgt_un_s | @cil_ble_un_s | @cil_blt_un_s |
+    @cil_beq | @cil_bge | @cil_bgt | @cil_ble | @cil_blt |
+    @cil_bne_un | @cil_bge_un | @cil_bgt_un | @cil_ble_un | @cil_blt_un;
+@cil_unary_jump = @cil_brfalse_s | @cil_brtrue_s | @cil_brfalse | @cil_brtrue | @cil_switch;
+@cil_unconditional_jump = @cil_br | @cil_br_s | @cil_leave_any;
+@cil_leave_any = @cil_leave | @cil_leave_s;
+@cil_jump = @cil_unconditional_jump | @cil_conditional_jump;
+
+// CIL call instructions
+
+@cil_call_any = @cil_jmp | @cil_call | @cil_calli | @cil_tail | @cil_callvirt | @cil_newobj;
+
+// CIL expression instructions
+
+@cil_expr = @cil_literal | @cil_binary_expr | @cil_unary_expr | @cil_call_any | @cil_read_access |
+  @cil_newarr | @cil_ldtoken | @cil_sizeof |
+  @cil_ldftn | @cil_ldvirtftn | @cil_localloc | @cil_mkrefany | @cil_refanytype | @cil_arglist | @cil_dup;
+
+@cil_unary_expr =
+  @cil_conversion_operation | @cil_unary_arithmetic_operation | @cil_unary_bitwise_operation|
+  @cil_ldlen | @cil_isinst | @cil_box | @cil_ldobj | @cil_castclass | @cil_unbox_any |
+  @cil_ldind | @cil_unbox;
+
+@cil_conversion_operation =
+  @cil_conv_i1 | @cil_conv_i2 | @cil_conv_i4 | @cil_conv_i8 |
+  @cil_conv_u1 | @cil_conv_u2 | @cil_conv_u4 | @cil_conv_u8 |
+  @cil_conv_ovf_i | @cil_conv_ovf_i_un | @cil_conv_ovf_i1 | @cil_conv_ovf_i1_un |
+  @cil_conv_ovf_i2 | @cil_conv_ovf_i2_un | @cil_conv_ovf_i4 | @cil_conv_ovf_i4_un |
+  @cil_conv_ovf_i8 | @cil_conv_ovf_i8_un | @cil_conv_ovf_u | @cil_conv_ovf_u_un |
+  @cil_conv_ovf_u1 | @cil_conv_ovf_u1_un | @cil_conv_ovf_u2 | @cil_conv_ovf_u2_un |
+  @cil_conv_ovf_u4 | @cil_conv_ovf_u4_un | @cil_conv_ovf_u8 | @cil_conv_ovf_u8_un |
+  @cil_conv_r4 | @cil_conv_r8 | @cil_conv_ovf_u2 | @cil_conv_ovf_u2_un |
+  @cil_conv_i | @cil_conv_u | @cil_conv_r_un;
+
+@cil_ldind = @cil_ldind_i | @cil_ldind_i1 | @cil_ldind_i2 | @cil_ldind_i4 | @cil_ldind_i8 |
+  @cil_ldind_r4 | @cil_ldind_r8 | @cil_ldind_ref | @cil_ldind_u1 | @cil_ldind_u2 | @cil_ldind_u4;
+
+@cil_stind = @cil_stind_i | @cil_stind_i1 | @cil_stind_i2 | @cil_stind_i4 | @cil_stind_i8 |
+  @cil_stind_r4 | @cil_stind_r8 | @cil_stind_ref;
+
+@cil_bitwise_operation = @cil_binary_bitwise_operation | @cil_unary_bitwise_operation;
+
+@cil_binary_bitwise_operation = @cil_and | @cil_or | @cil_xor | @cil_shr | @cil_shr | @cil_shr_un | @cil_shl;
+
+@cil_binary_arithmetic_operation = @cil_add | @cil_sub | @cil_mul | @cil_div | @cil_div_un |
+  @cil_rem | @cil_rem_un | @cil_add_ovf | @cil_add_ovf_un | @cil_mul_ovf | @cil_mul_ovf_un |
+  @cil_sub_ovf | @cil_sub_ovf_un;
+
+@cil_unary_bitwise_operation = @cil_not;
+
+@cil_binary_expr = @cil_binary_arithmetic_operation | @cil_binary_bitwise_operation | @cil_read_array | @cil_comparison_operation;
+
+@cil_unary_arithmetic_operation = @cil_neg;
+
+@cil_comparison_operation = @cil_cgt_un | @cil_ceq | @cil_cgt | @cil_clt | @cil_clt_un;
+
+// Elements that retrieve an address of something
+@cil_read_ref = @cil_ldloca_s | @cil_ldarga_s | @cil_ldflda | @cil_ldsflda | @cil_ldelema;
+
+// CIL array instructions
+
+@cil_read_array =
+  @cil_ldelem | @cil_ldelema | @cil_ldelem_i1 | @cil_ldelem_ref | @cil_ldelem_i |
+  @cil_ldelem_i1 | @cil_ldelem_i2 | @cil_ldelem_i4 | @cil_ldelem_i8 | @cil_ldelem_r4 |
+  @cil_ldelem_r8 | @cil_ldelem_u1 | @cil_ldelem_u2 | @cil_ldelem_u4;
+
+@cil_write_array = @cil_stelem | @cil_stelem_ref |
+  @cil_stelem_i | @cil_stelem_i1 | @cil_stelem_i2 | @cil_stelem_i4 | @cil_stelem_i8 |
+  @cil_stelem_r4 | @cil_stelem_r8;
+
+@cil_throw_any = @cil_throw | @cil_rethrow;
+
+#keyset[impl, index]
+cil_instruction(
+  unique int id: @cil_instruction,
+  int opcode: int ref,
+  int index: int ref,
+  int impl: @cil_method_implementation ref);
+
+cil_jump(
+  unique int instruction: @cil_jump ref,
+  int target: @cil_instruction ref);
+
+cil_access(
+  unique int instruction: @cil_instruction ref,
+  int target: @cil_accessible ref);
+
+cil_value(
+  unique int instruction: @cil_literal ref,
+  string value: string ref);
+
+#keyset[instruction, index]
+cil_switch(
+  int instruction: @cil_switch ref,
+  int index: int ref,
+  int target: @cil_instruction ref);
+
+cil_instruction_location(
+  unique int id: @cil_instruction ref,
+  int loc: @location ref);
+
+cil_type_location(
+  int id: @cil_type ref,
+  int loc: @location ref);
+
+cil_method_location(
+  int id: @cil_method ref,
+  int loc: @location ref);
+
+@cil_namespace = @namespace;
+
+@cil_type_container = @cil_type | @cil_namespace | @cil_method;
+
+case @cil_type.kind of
+  0 = @cil_valueorreftype
+| 1 = @cil_typeparameter
+| 2 = @cil_array_type
+| 3 = @cil_pointer_type
+| 4 = @cil_function_pointer_type
+;
+
+cil_type(
+  unique int id: @cil_type,
+  string name: string ref,
+  int kind: int ref,
+  int parent: @cil_type_container ref,
+  int sourceDecl: @cil_type ref);
+
+cil_pointer_type(
+  unique int id: @cil_pointer_type ref,
+  int pointee: @cil_type ref);
+
+cil_array_type(
+  unique int id: @cil_array_type ref,
+  int element_type: @cil_type ref,
+  int rank: int ref);
+
+cil_function_pointer_return_type(
+  unique int id: @cil_function_pointer_type ref,
+  int return_type: @cil_type ref);
+
+cil_method(
+  unique int id: @cil_method,
+  string name: string ref,
+  int parent: @cil_type ref,
+  int return_type: @cil_type ref);
+
+cil_method_source_declaration(
+  unique int method: @cil_method ref,
+  int source: @cil_method ref);
+
+cil_method_implementation(
+  unique int id: @cil_method_implementation,
+  int method: @cil_method ref,
+  int location: @assembly ref);
+
+cil_implements(
+  int id: @cil_method ref,
+  int decl: @cil_method ref);
+
+#keyset[parent, name]
+cil_field(
+  unique int id: @cil_field,
+  int parent: @cil_type ref,
+  string name: string ref,
+  int field_type: @cil_type ref);
+
+@cil_element = @cil_instruction | @cil_declaration | @cil_handler | @cil_attribute | @cil_namespace;
+@cil_named_element = @cil_declaration | @cil_namespace;
+@cil_declaration = @cil_variable | @cil_method | @cil_type | @cil_member;
+@cil_accessible = @cil_declaration;
+@cil_variable = @cil_field | @cil_stack_variable;
+@cil_stack_variable = @cil_local_variable | @cil_parameter;
+@cil_member = @cil_method | @cil_type | @cil_field | @cil_property | @cil_event;
+@cil_custom_modifier_receiver = @cil_method | @cil_property | @cil_parameter | @cil_field | @cil_function_pointer_type;
+@cil_parameterizable = @cil_method | @cil_function_pointer_type;
+@cil_has_type_annotation = @cil_stack_variable | @cil_property | @cil_method | @cil_function_pointer_type;
+
+#keyset[parameterizable, index]
+cil_parameter(
+  unique int id: @cil_parameter,
+  int parameterizable: @cil_parameterizable ref,
+  int index: int ref,
+  int param_type: @cil_type ref);
+
+cil_parameter_in(unique int id: @cil_parameter ref);
+cil_parameter_out(unique int id: @cil_parameter ref);
+
+cil_setter(unique int prop: @cil_property ref,
+  int method: @cil_method ref);
+
+#keyset[id, modifier]
+cil_custom_modifiers(
+  int id: @cil_custom_modifier_receiver ref,
+  int modifier: @cil_type ref,
+  int kind: int ref); // modreq: 1, modopt: 0
+
+cil_type_annotation(
+  int id: @cil_has_type_annotation ref,
+  int annotation: int ref);
+
+cil_getter(unique int prop: @cil_property ref,
+  int method: @cil_method ref);
+
+cil_adder(unique int event: @cil_event ref,
+  int method: @cil_method ref);
+
+cil_remover(unique int event: @cil_event ref, int method: @cil_method ref);
+
+cil_raiser(unique int event: @cil_event ref, int method: @cil_method ref);
+
+cil_property(
+  unique int id: @cil_property,
+  int parent: @cil_type ref,
+  string name: string ref,
+  int property_type: @cil_type ref);
+
+#keyset[parent, name]
+cil_event(unique int id: @cil_event,
+  int parent: @cil_type ref,
+  string name: string ref,
+  int event_type: @cil_type ref);
+
+#keyset[impl, index]
+cil_local_variable(
+  unique int id: @cil_local_variable,
+  int impl: @cil_method_implementation ref,
+  int index: int ref,
+  int var_type: @cil_type ref);
+
+cil_function_pointer_calling_conventions(
+  int id: @cil_function_pointer_type ref,
+  int kind: int ref);
+
+// CIL handlers (exception handlers etc).
+
+case @cil_handler.kind of
+  0 = @cil_catch_handler
+| 1 = @cil_filter_handler
+| 2 = @cil_finally_handler
+| 4 = @cil_fault_handler
+;
+
+#keyset[impl, index]
+cil_handler(
+  unique int id: @cil_handler,
+  int impl: @cil_method_implementation ref,
+  int index: int ref,
+  int kind: int ref,
+  int try_start: @cil_instruction ref,
+  int try_end: @cil_instruction ref,
+  int handler_start: @cil_instruction ref);
+
+cil_handler_filter(
+  unique int id: @cil_handler ref,
+  int filter_start: @cil_instruction ref);
+
+cil_handler_type(
+  unique int id: @cil_handler ref,
+  int catch_type: @cil_type ref);
+
+@cil_controlflow_node = @cil_entry_point | @cil_instruction;
+
+@cil_entry_point = @cil_method_implementation | @cil_handler;
+
+@cil_dataflow_node = @cil_instruction | @cil_variable | @cil_method;
+
+cil_method_stack_size(
+  unique int method: @cil_method_implementation ref,
+  int size: int ref);
+
+// CIL modifiers
+
+cil_public(int id: @cil_member ref);
+cil_private(int id: @cil_member ref);
+cil_protected(int id: @cil_member ref);
+cil_internal(int id: @cil_member ref);
+cil_static(int id: @cil_member ref);
+cil_sealed(int id: @cil_member ref);
+cil_virtual(int id: @cil_method ref);
+cil_abstract(int id: @cil_member ref);
+cil_class(int id: @cil_type ref);
+cil_interface(int id: @cil_type ref);
+cil_security(int id: @cil_member ref);
+cil_requiresecobject(int id: @cil_method ref);
+cil_specialname(int id: @cil_method ref);
+cil_newslot(int id: @cil_method ref);
+
+cil_base_class(unique int id: @cil_type ref, int base: @cil_type ref);
+cil_base_interface(int id: @cil_type ref, int base: @cil_type ref);
+cil_enum_underlying_type(unique int id: @cil_type ref, int underlying: @cil_type ref);
+
+#keyset[unbound, index]
+cil_type_parameter(
+  int unbound: @cil_member ref,
+  int index: int ref,
+  int param: @cil_typeparameter ref);
+
+#keyset[bound, index]
+cil_type_argument(
+  int bound: @cil_member ref,
+  int index: int ref,
+  int t: @cil_type ref);
+
+// CIL type parameter constraints
+
+cil_typeparam_covariant(int tp: @cil_typeparameter ref);
+cil_typeparam_contravariant(int tp: @cil_typeparameter ref);
+cil_typeparam_class(int tp: @cil_typeparameter ref);
+cil_typeparam_struct(int tp: @cil_typeparameter ref);
+cil_typeparam_new(int tp: @cil_typeparameter ref);
+cil_typeparam_constraint(int tp: @cil_typeparameter ref, int supertype: @cil_type ref);
+
+// CIL attributes
+
+cil_attribute(
+  unique int attributeid: @cil_attribute,
+  int element: @cil_declaration ref,
+  int constructor: @cil_method ref);
+
+#keyset[attribute_id, param]
+cil_attribute_named_argument(
+  int attribute_id: @cil_attribute ref,
+  string param: string ref,
+  string value: string ref);
+
+#keyset[attribute_id, index]
+cil_attribute_positional_argument(
+  int attribute_id: @cil_attribute ref,
+  int index: int ref,
+  string value: string ref);
+
+
+// Common .Net data model covering both C# and CIL
+
+// Common elements
+@dotnet_element = @element | @cil_element;
+@dotnet_named_element = @named_element | @cil_named_element;
+@dotnet_callable = @callable | @cil_method;
+@dotnet_variable = @variable | @cil_variable;
+@dotnet_field = @field | @cil_field;
+@dotnet_parameter = @parameter | @cil_parameter;
+@dotnet_declaration = @declaration | @cil_declaration;
+@dotnet_member = @member | @cil_member;
+@dotnet_event = @event | @cil_event;
+@dotnet_property = @property | @cil_property | @indexer;
+@dotnet_parameterizable = @parameterizable | @cil_parameterizable;
+
+// Common types
+@dotnet_type = @type | @cil_type;
+@dotnet_call = @call | @cil_call_any;
+@dotnet_throw = @throw_element | @cil_throw_any;
+@dotnet_valueorreftype = @cil_valueorreftype | @value_or_ref_type | @cil_array_type | @void_type;
+@dotnet_typeparameter = @type_parameter | @cil_typeparameter;
+@dotnet_array_type = @array_type | @cil_array_type;
+@dotnet_pointer_type = @pointer_type | @cil_pointer_type;
+@dotnet_type_parameter = @type_parameter | @cil_typeparameter;
+@dotnet_generic = @dotnet_valueorreftype | @dotnet_callable;
+
+// Attributes
+@dotnet_attribute = @attribute | @cil_attribute;
+
+// Expressions
+@dotnet_expr = @expr | @cil_expr;
+
+// Literals
+@dotnet_literal = @literal_expr | @cil_literal;
+@dotnet_string_literal = @string_literal_expr | @cil_ldstr;
+@dotnet_int_literal = @integer_literal_expr | @cil_ldc_i;
+@dotnet_float_literal = @float_literal_expr | @cil_ldc_r;
+@dotnet_null_literal = @null_literal_expr | @cil_ldnull;
+
+@metadata_entity = @cil_method | @cil_type | @cil_field | @cil_property | @field | @property |
+    @callable | @value_or_ref_type | @void_type;
+
+#keyset[entity, location]
+metadata_handle(int entity : @metadata_entity ref, int location: @assembly ref, int handle: int ref)
diff --git a/csharp/ql/lib/upgrades/83aca6b3e4fa38dd2b97b9b51dfc199a2ba9c7f2/upgrade.properties b/csharp/ql/lib/upgrades/83aca6b3e4fa38dd2b97b9b51dfc199a2ba9c7f2/upgrade.properties
new file mode 100644
index 00000000000..25d7416df1c
--- /dev/null
+++ b/csharp/ql/lib/upgrades/83aca6b3e4fa38dd2b97b9b51dfc199a2ba9c7f2/upgrade.properties
@@ -0,0 +1,2 @@
+description: Add unsigned right shift and unsigned right shift assignment expression kinds.
+compatibility: backwards
diff --git a/csharp/ql/src/experimental/ir/implementation/Opcode.qll b/csharp/ql/src/experimental/ir/implementation/Opcode.qll
index c4134d240ab..b4def7fe4ae 100644
--- a/csharp/ql/src/experimental/ir/implementation/Opcode.qll
+++ b/csharp/ql/src/experimental/ir/implementation/Opcode.qll
@@ -30,6 +30,7 @@ private newtype TOpcode =
   TNegate() or
   TShiftLeft() or
   TShiftRight() or
+  TUnsignedShiftRight() or
   TBitAnd() or
   TBitOr() or
   TBitXor() or
@@ -652,6 +653,15 @@ module Opcode {
     final override string toString() { result = "ShiftRight" }
   }
 
+  /**
+   * The `Opcode` for a `UnsignedShiftRightInstruction`.
+   *
+   * See the `UnsignedShiftRightInstruction` documentation for more details.
+   */
+  class UnsignedShiftRight extends BinaryBitwiseOpcode, TUnsignedShiftRight {
+    final override string toString() { result = "UnsignedShiftRight" }
+  }
+
   /**
    * The `Opcode` for a `BitAndInstruction`.
    *
diff --git a/csharp/ql/src/experimental/ir/implementation/raw/Instruction.qll b/csharp/ql/src/experimental/ir/implementation/raw/Instruction.qll
index 7afe954023b..0aa7c552638 100644
--- a/csharp/ql/src/experimental/ir/implementation/raw/Instruction.qll
+++ b/csharp/ql/src/experimental/ir/implementation/raw/Instruction.qll
@@ -1204,6 +1204,17 @@ class ShiftRightInstruction extends BinaryBitwiseInstruction {
   ShiftRightInstruction() { this.getOpcode() instanceof Opcode::ShiftRight }
 }
 
+/**
+ * An instruction that shifts its left operand to the right by the number of bits specified by its
+ * right operand.
+ *
+ * Both operands must have an integer type. The result has the same type as the left operand.
+ * The leftmost bits are zero-filled.
+ */
+class UnsignedShiftRightInstruction extends BinaryBitwiseInstruction {
+  UnsignedShiftRightInstruction() { this.getOpcode() instanceof Opcode::UnsignedShiftRight }
+}
+
 /**
  * An instruction that performs a binary arithmetic operation involving at least one pointer
  * operand.
diff --git a/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedExpr.qll b/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedExpr.qll
index 1bcca401565..06391c010b4 100644
--- a/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedExpr.qll
+++ b/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedExpr.qll
@@ -1091,9 +1091,11 @@ class TranslatedCast extends TranslatedNonConstantExpr {
 }
 
 private Opcode binaryBitwiseOpcode(BinaryBitwiseOperation expr) {
-  expr instanceof LShiftExpr and result instanceof Opcode::ShiftLeft
+  expr instanceof LeftShiftExpr and result instanceof Opcode::ShiftLeft
   or
-  expr instanceof RShiftExpr and result instanceof Opcode::ShiftRight
+  expr instanceof RightShiftExpr and result instanceof Opcode::ShiftRight
+  or
+  expr instanceof UnsignedRightShiftExpr and result instanceof Opcode::UnsignedShiftRight
   or
   expr instanceof BitwiseAndExpr and result instanceof Opcode::BitAnd
   or
@@ -1377,8 +1379,9 @@ class TranslatedAssignOperation extends TranslatedAssignment {
 
   private Type getConvertedLeftOperandType() {
     if
-      expr instanceof AssignLShiftExpr or
-      expr instanceof AssignRShiftExpr
+      expr instanceof AssignLeftShiftExpr or
+      expr instanceof AssignRightShiftExpr or
+      expr instanceof AssignUnsighedRightShiftExpr
     then result = this.getLeftOperand().getResultType()
     else
       // The right operand has already been converted to the type of the op.
@@ -1416,9 +1419,11 @@ class TranslatedAssignOperation extends TranslatedAssignment {
     or
     expr instanceof AssignXorExpr and result instanceof Opcode::BitXor
     or
-    expr instanceof AssignLShiftExpr and result instanceof Opcode::ShiftLeft
+    expr instanceof AssignLeftShiftExpr and result instanceof Opcode::ShiftLeft
     or
-    expr instanceof AssignRShiftExpr and result instanceof Opcode::ShiftRight
+    expr instanceof AssignRightShiftExpr and result instanceof Opcode::ShiftRight
+    or
+    expr instanceof AssignUnsighedRightShiftExpr and result instanceof Opcode::UnsignedShiftRight
   }
 
   override predicate hasInstruction(Opcode opcode, InstructionTag tag, CSharpType resultType) {
diff --git a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/Instruction.qll b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/Instruction.qll
index 7afe954023b..0aa7c552638 100644
--- a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/Instruction.qll
+++ b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/Instruction.qll
@@ -1204,6 +1204,17 @@ class ShiftRightInstruction extends BinaryBitwiseInstruction {
   ShiftRightInstruction() { this.getOpcode() instanceof Opcode::ShiftRight }
 }
 
+/**
+ * An instruction that shifts its left operand to the right by the number of bits specified by its
+ * right operand.
+ *
+ * Both operands must have an integer type. The result has the same type as the left operand.
+ * The leftmost bits are zero-filled.
+ */
+class UnsignedShiftRightInstruction extends BinaryBitwiseInstruction {
+  UnsignedShiftRightInstruction() { this.getOpcode() instanceof Opcode::UnsignedShiftRight }
+}
+
 /**
  * An instruction that performs a binary arithmetic operation involving at least one pointer
  * operand.
diff --git a/csharp/ql/src/experimental/ir/rangeanalysis/SignAnalysis.qll b/csharp/ql/src/experimental/ir/rangeanalysis/SignAnalysis.qll
index 44548e0517a..b74f7c90db5 100644
--- a/csharp/ql/src/experimental/ir/rangeanalysis/SignAnalysis.qll
+++ b/csharp/ql/src/experimental/ir/rangeanalysis/SignAnalysis.qll
@@ -522,6 +522,8 @@ module SignAnalysisCached {
         i instanceof ShiftRightInstruction and
         not i.getResultType().(IntegralType) instanceof SignedIntegralType and
         result = s1.urshift(s2)
+        or
+        i instanceof UnsignedShiftRightInstruction and result = s1.urshift(s2)
       )
       or
       // use hasGuard here?
diff --git a/csharp/ql/test/experimental/ir/ir/PrintAst.expected b/csharp/ql/test/experimental/ir/ir/PrintAst.expected
index 41b5b6daead..cc96a82bbc1 100644
--- a/csharp/ql/test/experimental/ir/ir/PrintAst.expected
+++ b/csharp/ql/test/experimental/ir/ir/PrintAst.expected
@@ -118,59 +118,63 @@ array.cs:
 #   20|             0: [IntLiteral] 1
 assignop.cs:
 #    3| [Class] AssignOp
-#    4|   5: [Method] Main
-#    4|     -1: [TypeMention] Void
-#    4|     4: [BlockStmt] {...}
-#    5|       0: [LocalVariableDeclStmt] ... ...;
-#    5|         0: [LocalVariableDeclAndInitExpr] Int32 a = ...
-#    5|           -1: [TypeMention] int
-#    5|           0: [LocalVariableAccess] access to local variable a
-#    5|           1: [IntLiteral] 1
-#    6|       1: [LocalVariableDeclStmt] ... ...;
-#    6|         0: [LocalVariableDeclAndInitExpr] Int32 c = ...
-#    6|           -1: [TypeMention] int
-#    6|           0: [LocalVariableAccess] access to local variable c
-#    6|           1: [IntLiteral] 1
-#    8|       2: [ExprStmt] ...;
-#    8|         0: [AssignAddExpr] ... += ...
+#    5|   5: [Method] Main
+#    5|     -1: [TypeMention] Void
+#    6|     4: [BlockStmt] {...}
+#    7|       0: [LocalVariableDeclStmt] ... ...;
+#    7|         0: [LocalVariableDeclAndInitExpr] Int32 a = ...
+#    7|           -1: [TypeMention] int
+#    7|           0: [LocalVariableAccess] access to local variable a
+#    7|           1: [IntLiteral] 1
+#    8|       1: [LocalVariableDeclStmt] ... ...;
+#    8|         0: [LocalVariableDeclAndInitExpr] Int32 c = ...
+#    8|           -1: [TypeMention] int
 #    8|           0: [LocalVariableAccess] access to local variable c
-#    8|           1: [LocalVariableAccess] access to local variable a
-#    9|       3: [ExprStmt] ...;
-#    9|         0: [AssignSubExpr] ... -= ...
-#    9|           0: [LocalVariableAccess] access to local variable c
-#    9|           1: [LocalVariableAccess] access to local variable a
-#   10|       4: [ExprStmt] ...;
-#   10|         0: [AssignMulExpr] ... *= ...
+#    8|           1: [IntLiteral] 1
+#   10|       2: [ExprStmt] ...;
+#   10|         0: [AssignAddExpr] ... += ...
 #   10|           0: [LocalVariableAccess] access to local variable c
 #   10|           1: [LocalVariableAccess] access to local variable a
-#   11|       5: [ExprStmt] ...;
-#   11|         0: [AssignDivExpr] ... /= ...
+#   11|       3: [ExprStmt] ...;
+#   11|         0: [AssignSubExpr] ... -= ...
 #   11|           0: [LocalVariableAccess] access to local variable c
 #   11|           1: [LocalVariableAccess] access to local variable a
-#   12|       6: [ExprStmt] ...;
-#   12|         0: [AssignRemExpr] ... %= ...
+#   12|       4: [ExprStmt] ...;
+#   12|         0: [AssignMulExpr] ... *= ...
 #   12|           0: [LocalVariableAccess] access to local variable c
 #   12|           1: [LocalVariableAccess] access to local variable a
-#   13|       7: [ExprStmt] ...;
-#   13|         0: [AssignLShiftExpr] ... <<= ...
+#   13|       5: [ExprStmt] ...;
+#   13|         0: [AssignDivExpr] ... /= ...
 #   13|           0: [LocalVariableAccess] access to local variable c
-#   13|           1: [IntLiteral] 2
-#   14|       8: [ExprStmt] ...;
-#   14|         0: [AssignRShiftExpr] ... >>= ...
+#   13|           1: [LocalVariableAccess] access to local variable a
+#   14|       6: [ExprStmt] ...;
+#   14|         0: [AssignRemExpr] ... %= ...
 #   14|           0: [LocalVariableAccess] access to local variable c
-#   14|           1: [IntLiteral] 2
-#   15|       9: [ExprStmt] ...;
-#   15|         0: [AssignAndExpr] ... &= ...
+#   14|           1: [LocalVariableAccess] access to local variable a
+#   15|       7: [ExprStmt] ...;
+#   15|         0: [AssignLeftShiftExpr] ... <<= ...
 #   15|           0: [LocalVariableAccess] access to local variable c
 #   15|           1: [IntLiteral] 2
-#   16|       10: [ExprStmt] ...;
-#   16|         0: [AssignXorExpr] ... ^= ...
+#   16|       8: [ExprStmt] ...;
+#   16|         0: [AssignRightShiftExpr] ... >>= ...
 #   16|           0: [LocalVariableAccess] access to local variable c
 #   16|           1: [IntLiteral] 2
-#   17|       11: [ExprStmt] ...;
-#   17|         0: [AssignOrExpr] ... |= ...
+#   17|       9: [ExprStmt] ...;
+#   17|         0: [AssignAndExpr] ... &= ...
 #   17|           0: [LocalVariableAccess] access to local variable c
 #   17|           1: [IntLiteral] 2
+#   18|       10: [ExprStmt] ...;
+#   18|         0: [AssignXorExpr] ... ^= ...
+#   18|           0: [LocalVariableAccess] access to local variable c
+#   18|           1: [IntLiteral] 2
+#   19|       11: [ExprStmt] ...;
+#   19|         0: [AssignOrExpr] ... |= ...
+#   19|           0: [LocalVariableAccess] access to local variable c
+#   19|           1: [IntLiteral] 2
+#   20|       12: [ExprStmt] ...;
+#   20|         0: [AssignUnsighedRightShiftExpr] ... >>>= ...
+#   20|           0: [LocalVariableAccess] access to local variable c
+#   20|           1: [IntLiteral] 2
 casts.cs:
 #    1| [Class] Casts_A
 #    5| [Class] Casts_B
diff --git a/csharp/ql/test/experimental/ir/ir/assignop.cs b/csharp/ql/test/experimental/ir/ir/assignop.cs
index f5c2a6fa19d..21fdfccbcf9 100644
--- a/csharp/ql/test/experimental/ir/ir/assignop.cs
+++ b/csharp/ql/test/experimental/ir/ir/assignop.cs
@@ -1,19 +1,22 @@
 using System;
 
-class AssignOp {   
-    static void Main() {
+class AssignOp
+{
+    static void Main()
+    {
         int a = 1;
         int c = 1;
-        
-        c += a; 
+
+        c += a;
         c -= a;
-        c *= a; 
+        c *= a;
         c /= a;
-        c %= a; 
-        c <<= 2; 
-        c >>= 2; 
-        c &= 2; 
-        c ^= 2; 
+        c %= a;
+        c <<= 2;
+        c >>= 2;
+        c &= 2;
+        c ^= 2;
         c |= 2;
+        c >>>= 2;
     }
 }
diff --git a/csharp/ql/test/experimental/ir/ir/raw_ir.expected b/csharp/ql/test/experimental/ir/ir/raw_ir.expected
index bf639694da5..2461e6602b9 100644
--- a/csharp/ql/test/experimental/ir/ir/raw_ir.expected
+++ b/csharp/ql/test/experimental/ir/ir/raw_ir.expected
@@ -145,74 +145,79 @@ array.cs:
 #   13|     v13_6(Void)             = ExitFunction       : 
 
 assignop.cs:
-#    4| System.Void AssignOp.Main()
-#    4|   Block 0
-#    4|     v4_1(Void)          = EnterFunction      : 
-#    4|     mu4_2(<unknown>)    = AliasedDefinition  : 
-#    5|     r5_1(glval<Int32>)  = VariableAddress[a] : 
-#    5|     r5_2(Int32)         = Constant[1]        : 
-#    5|     mu5_3(Int32)        = Store[a]           : &:r5_1, r5_2
-#    6|     r6_1(glval<Int32>)  = VariableAddress[c] : 
-#    6|     r6_2(Int32)         = Constant[1]        : 
-#    6|     mu6_3(Int32)        = Store[c]           : &:r6_1, r6_2
-#    8|     r8_1(glval<Int32>)  = VariableAddress[a] : 
-#    8|     r8_2(Int32)         = Load[a]            : &:r8_1, ~m?
-#    8|     r8_3(glval<Int32>)  = VariableAddress[c] : 
-#    8|     r8_4(Int32)         = Load[c]            : &:r8_3, ~m?
-#    8|     r8_5(Int32)         = Add                : r8_4, r8_2
-#    8|     mu8_6(Int32)        = Store[c]           : &:r8_3, r8_5
-#    9|     r9_1(glval<Int32>)  = VariableAddress[a] : 
-#    9|     r9_2(Int32)         = Load[a]            : &:r9_1, ~m?
-#    9|     r9_3(glval<Int32>)  = VariableAddress[c] : 
-#    9|     r9_4(Int32)         = Load[c]            : &:r9_3, ~m?
-#    9|     r9_5(Int32)         = Sub                : r9_4, r9_2
-#    9|     mu9_6(Int32)        = Store[c]           : &:r9_3, r9_5
+#    5| System.Void AssignOp.Main()
+#    5|   Block 0
+#    5|     v5_1(Void)          = EnterFunction      : 
+#    5|     mu5_2(<unknown>)    = AliasedDefinition  : 
+#    7|     r7_1(glval<Int32>)  = VariableAddress[a] : 
+#    7|     r7_2(Int32)         = Constant[1]        : 
+#    7|     mu7_3(Int32)        = Store[a]           : &:r7_1, r7_2
+#    8|     r8_1(glval<Int32>)  = VariableAddress[c] : 
+#    8|     r8_2(Int32)         = Constant[1]        : 
+#    8|     mu8_3(Int32)        = Store[c]           : &:r8_1, r8_2
 #   10|     r10_1(glval<Int32>) = VariableAddress[a] : 
 #   10|     r10_2(Int32)        = Load[a]            : &:r10_1, ~m?
 #   10|     r10_3(glval<Int32>) = VariableAddress[c] : 
 #   10|     r10_4(Int32)        = Load[c]            : &:r10_3, ~m?
-#   10|     r10_5(Int32)        = Mul                : r10_4, r10_2
+#   10|     r10_5(Int32)        = Add                : r10_4, r10_2
 #   10|     mu10_6(Int32)       = Store[c]           : &:r10_3, r10_5
 #   11|     r11_1(glval<Int32>) = VariableAddress[a] : 
 #   11|     r11_2(Int32)        = Load[a]            : &:r11_1, ~m?
 #   11|     r11_3(glval<Int32>) = VariableAddress[c] : 
 #   11|     r11_4(Int32)        = Load[c]            : &:r11_3, ~m?
-#   11|     r11_5(Int32)        = Div                : r11_4, r11_2
+#   11|     r11_5(Int32)        = Sub                : r11_4, r11_2
 #   11|     mu11_6(Int32)       = Store[c]           : &:r11_3, r11_5
 #   12|     r12_1(glval<Int32>) = VariableAddress[a] : 
 #   12|     r12_2(Int32)        = Load[a]            : &:r12_1, ~m?
 #   12|     r12_3(glval<Int32>) = VariableAddress[c] : 
 #   12|     r12_4(Int32)        = Load[c]            : &:r12_3, ~m?
-#   12|     r12_5(Int32)        = Rem                : r12_4, r12_2
+#   12|     r12_5(Int32)        = Mul                : r12_4, r12_2
 #   12|     mu12_6(Int32)       = Store[c]           : &:r12_3, r12_5
-#   13|     r13_1(Int32)        = Constant[2]        : 
-#   13|     r13_2(glval<Int32>) = VariableAddress[c] : 
-#   13|     r13_3(Int32)        = Load[c]            : &:r13_2, ~m?
-#   13|     r13_4(Int32)        = ShiftLeft          : r13_3, r13_1
-#   13|     mu13_5(Int32)       = Store[c]           : &:r13_2, r13_4
-#   14|     r14_1(Int32)        = Constant[2]        : 
-#   14|     r14_2(glval<Int32>) = VariableAddress[c] : 
-#   14|     r14_3(Int32)        = Load[c]            : &:r14_2, ~m?
-#   14|     r14_4(Int32)        = ShiftRight         : r14_3, r14_1
-#   14|     mu14_5(Int32)       = Store[c]           : &:r14_2, r14_4
+#   13|     r13_1(glval<Int32>) = VariableAddress[a] : 
+#   13|     r13_2(Int32)        = Load[a]            : &:r13_1, ~m?
+#   13|     r13_3(glval<Int32>) = VariableAddress[c] : 
+#   13|     r13_4(Int32)        = Load[c]            : &:r13_3, ~m?
+#   13|     r13_5(Int32)        = Div                : r13_4, r13_2
+#   13|     mu13_6(Int32)       = Store[c]           : &:r13_3, r13_5
+#   14|     r14_1(glval<Int32>) = VariableAddress[a] : 
+#   14|     r14_2(Int32)        = Load[a]            : &:r14_1, ~m?
+#   14|     r14_3(glval<Int32>) = VariableAddress[c] : 
+#   14|     r14_4(Int32)        = Load[c]            : &:r14_3, ~m?
+#   14|     r14_5(Int32)        = Rem                : r14_4, r14_2
+#   14|     mu14_6(Int32)       = Store[c]           : &:r14_3, r14_5
 #   15|     r15_1(Int32)        = Constant[2]        : 
 #   15|     r15_2(glval<Int32>) = VariableAddress[c] : 
 #   15|     r15_3(Int32)        = Load[c]            : &:r15_2, ~m?
-#   15|     r15_4(Int32)        = BitAnd             : r15_3, r15_1
+#   15|     r15_4(Int32)        = ShiftLeft          : r15_3, r15_1
 #   15|     mu15_5(Int32)       = Store[c]           : &:r15_2, r15_4
 #   16|     r16_1(Int32)        = Constant[2]        : 
 #   16|     r16_2(glval<Int32>) = VariableAddress[c] : 
 #   16|     r16_3(Int32)        = Load[c]            : &:r16_2, ~m?
-#   16|     r16_4(Int32)        = BitXor             : r16_3, r16_1
+#   16|     r16_4(Int32)        = ShiftRight         : r16_3, r16_1
 #   16|     mu16_5(Int32)       = Store[c]           : &:r16_2, r16_4
 #   17|     r17_1(Int32)        = Constant[2]        : 
 #   17|     r17_2(glval<Int32>) = VariableAddress[c] : 
 #   17|     r17_3(Int32)        = Load[c]            : &:r17_2, ~m?
-#   17|     r17_4(Int32)        = BitOr              : r17_3, r17_1
+#   17|     r17_4(Int32)        = BitAnd             : r17_3, r17_1
 #   17|     mu17_5(Int32)       = Store[c]           : &:r17_2, r17_4
-#    4|     v4_3(Void)          = ReturnVoid         : 
-#    4|     v4_4(Void)          = AliasedUse         : ~m?
-#    4|     v4_5(Void)          = ExitFunction       : 
+#   18|     r18_1(Int32)        = Constant[2]        : 
+#   18|     r18_2(glval<Int32>) = VariableAddress[c] : 
+#   18|     r18_3(Int32)        = Load[c]            : &:r18_2, ~m?
+#   18|     r18_4(Int32)        = BitXor             : r18_3, r18_1
+#   18|     mu18_5(Int32)       = Store[c]           : &:r18_2, r18_4
+#   19|     r19_1(Int32)        = Constant[2]        : 
+#   19|     r19_2(glval<Int32>) = VariableAddress[c] : 
+#   19|     r19_3(Int32)        = Load[c]            : &:r19_2, ~m?
+#   19|     r19_4(Int32)        = BitOr              : r19_3, r19_1
+#   19|     mu19_5(Int32)       = Store[c]           : &:r19_2, r19_4
+#   20|     r20_1(Int32)        = Constant[2]        : 
+#   20|     r20_2(glval<Int32>) = VariableAddress[c] : 
+#   20|     r20_3(Int32)        = Load[c]            : &:r20_2, ~m?
+#   20|     r20_4(Int32)        = UnsignedShiftRight : r20_3, r20_1
+#   20|     mu20_5(Int32)       = Store[c]           : &:r20_2, r20_4
+#    5|     v5_3(Void)          = ReturnVoid         : 
+#    5|     v5_4(Void)          = AliasedUse         : ~m?
+#    5|     v5_5(Void)          = ExitFunction       : 
 
 casts.cs:
 #   11| System.Void Casts.Main()
diff --git a/csharp/ql/test/library-tests/csharp11/Operators.cs b/csharp/ql/test/library-tests/csharp11/Operators.cs
new file mode 100644
index 00000000000..d5c4f8be091
--- /dev/null
+++ b/csharp/ql/test/library-tests/csharp11/Operators.cs
@@ -0,0 +1,20 @@
+
+public class MyClass
+{
+    public void M1()
+    {
+        var x1 = 1;
+        var x2 = x1 >>> 2;
+
+        var y1 = -2;
+        var y2 = y1 >>> 3;
+
+        var z = -4;
+        z >>>= 5;
+    }
+}
+
+public class MyOperatorClass
+{
+    public static MyOperatorClass operator >>>(MyOperatorClass a, MyOperatorClass b) { return null; }
+}
\ No newline at end of file
diff --git a/csharp/ql/test/library-tests/csharp11/SignAnalysis.cs b/csharp/ql/test/library-tests/csharp11/SignAnalysis.cs
new file mode 100644
index 00000000000..09e7ceb9fdc
--- /dev/null
+++ b/csharp/ql/test/library-tests/csharp11/SignAnalysis.cs
@@ -0,0 +1,42 @@
+public class MySignAnalysis
+{
+
+    public void UnsignedRightShiftSign(int x, int y)
+    {
+        int z;
+        if (x == 0)
+        {
+            z = x >>> y;
+        }
+
+        if (y == 0)
+        {
+            z = x >>> y;
+        }
+
+        if (x > 0 && y == 0)
+        {
+            z = x >>> y;
+        }
+
+        if (x > 0 && y > 0)
+        {
+            z = x >>> y;
+        }
+
+        if (x > 0 && y < 0)
+        {
+            z = x >>> y;
+        }
+
+        if (x < 0 && y > 0)
+        {
+            z = x >>> y;
+        }
+
+        if (x < 0 && y < 0)
+        {
+            z = x >>> y;
+        }
+    }
+}
\ No newline at end of file
diff --git a/csharp/ql/test/library-tests/csharp11/operators.expected b/csharp/ql/test/library-tests/csharp11/operators.expected
new file mode 100644
index 00000000000..2c7bda6800d
--- /dev/null
+++ b/csharp/ql/test/library-tests/csharp11/operators.expected
@@ -0,0 +1,8 @@
+binarybitwise
+| Operators.cs:7:18:7:25 | ... >>> ... | Operators.cs:7:18:7:19 | access to local variable x1 | Operators.cs:7:25:7:25 | 2 | >>> | UnsignedRightShiftExpr |
+| Operators.cs:10:18:10:25 | ... >>> ... | Operators.cs:10:18:10:19 | access to local variable y1 | Operators.cs:10:25:10:25 | 3 | >>> | UnsignedRightShiftExpr |
+| Operators.cs:13:9:13:16 | ... >>> ... | Operators.cs:13:9:13:9 | access to local variable z | Operators.cs:13:16:13:16 | 5 | >>> | UnsignedRightShiftExpr |
+assignbitwise
+| Operators.cs:13:9:13:16 | ... >>>= ... | Operators.cs:13:9:13:9 | access to local variable z | Operators.cs:13:16:13:16 | 5 | >>>= | AssignUnsighedRightShiftExpr |
+userdefined
+| Operators.cs:19:44:19:46 | >>> | op_UnsignedRightShift | UnsignedRightShiftOperator |
diff --git a/csharp/ql/test/library-tests/csharp11/operators.ql b/csharp/ql/test/library-tests/csharp11/operators.ql
new file mode 100644
index 00000000000..607efac0c26
--- /dev/null
+++ b/csharp/ql/test/library-tests/csharp11/operators.ql
@@ -0,0 +1,27 @@
+import csharp
+
+query predicate binarybitwise(
+  BinaryBitwiseOperation op, Expr left, Expr right, string name, string qlclass
+) {
+  op.getFile().getStem() = "Operators" and
+  left = op.getLeftOperand() and
+  right = op.getRightOperand() and
+  name = op.getOperator() and
+  qlclass = op.getAPrimaryQlClass()
+}
+
+query predicate assignbitwise(
+  AssignBitwiseOperation op, Expr left, Expr right, string name, string qlclass
+) {
+  op.getFile().getStem() = "Operators" and
+  left = op.getLValue() and
+  right = op.getRValue() and
+  name = op.getOperator() and
+  qlclass = op.getAPrimaryQlClass()
+}
+
+query predicate userdefined(Operator op, string fname, string qlclass) {
+  op.getFile().getStem() = "Operators" and
+  fname = op.getFunctionName() and
+  qlclass = op.getAPrimaryQlClass()
+}
diff --git a/csharp/ql/test/library-tests/csharp11/signAnalysis.expected b/csharp/ql/test/library-tests/csharp11/signAnalysis.expected
new file mode 100644
index 00000000000..952719939ad
--- /dev/null
+++ b/csharp/ql/test/library-tests/csharp11/signAnalysis.expected
@@ -0,0 +1,7 @@
+| SignAnalysis.cs:9:17:9:23 | ... >>> ... | 0 |
+| SignAnalysis.cs:14:17:14:23 | ... >>> ... | + - 0 |
+| SignAnalysis.cs:19:17:19:23 | ... >>> ... | + |
+| SignAnalysis.cs:24:17:24:23 | ... >>> ... | + 0 |
+| SignAnalysis.cs:29:17:29:23 | ... >>> ... | + 0 |
+| SignAnalysis.cs:34:17:34:23 | ... >>> ... | + - |
+| SignAnalysis.cs:39:17:39:23 | ... >>> ... | + - |
diff --git a/csharp/ql/test/library-tests/csharp11/signAnalysis.ql b/csharp/ql/test/library-tests/csharp11/signAnalysis.ql
new file mode 100644
index 00000000000..2aeb57e29fb
--- /dev/null
+++ b/csharp/ql/test/library-tests/csharp11/signAnalysis.ql
@@ -0,0 +1,9 @@
+import csharp
+import semmle.code.csharp.dataflow.internal.rangeanalysis.SignAnalysisCommon as Common
+
+from ControlFlow::Nodes::ExprNode e, Expr expr
+where
+  e.getExpr() = expr and
+  expr.getFile().getStem() = "SignAnalysis" and
+  expr instanceof UnsignedRightShiftExpr
+select e, strictconcat(string s | s = Common::exprSign(e).toString() | s, " ")
diff --git a/csharp/ql/test/library-tests/indexers/PrintAst.expected b/csharp/ql/test/library-tests/indexers/PrintAst.expected
index cd97a04290a..36f15f11909 100644
--- a/csharp/ql/test/library-tests/indexers/PrintAst.expected
+++ b/csharp/ql/test/library-tests/indexers/PrintAst.expected
@@ -25,7 +25,7 @@ indexers.cs:
 #   18|               -1: [TypeMention] Int32[]
 #   18|                 1: [TypeMention] int
 #   18|               0: [AddExpr] ... + ...
-#   18|                 0: [RShiftExpr] ... >> ...
+#   18|                 0: [RightShiftExpr] ... >> ...
 #   18|                   0: [SubExpr] ... - ...
 #   18|                     0: [ParameterAccess] access to parameter length
 #   18|                     1: [IntLiteral] 1
@@ -68,10 +68,10 @@ indexers.cs:
 #   32|               0: [BitwiseAndExpr] ... & ...
 #   32|                 0: [ArrayAccess] access to array element
 #   32|                   -1: [FieldAccess] access to field bits
-#   32|                   0: [RShiftExpr] ... >> ...
+#   32|                   0: [RightShiftExpr] ... >> ...
 #   32|                     0: [ParameterAccess] access to parameter index
 #   32|                     1: [IntLiteral] 5
-#   32|                 1: [LShiftExpr] ... << ...
+#   32|                 1: [LeftShiftExpr] ... << ...
 #   32|                   0: [IntLiteral] 1
 #   32|                   1: [ParameterAccess] access to parameter index
 #   32|               1: [IntLiteral] 0
@@ -99,10 +99,10 @@ indexers.cs:
 #   42|                 0: [AssignOrExpr] ... |= ...
 #   42|                   0: [ArrayAccess] access to array element
 #   42|                     -1: [FieldAccess] access to field bits
-#   42|                     0: [RShiftExpr] ... >> ...
+#   42|                     0: [RightShiftExpr] ... >> ...
 #   42|                       0: [ParameterAccess] access to parameter index
 #   42|                       1: [IntLiteral] 5
-#   42|                   1: [LShiftExpr] ... << ...
+#   42|                   1: [LeftShiftExpr] ... << ...
 #   42|                     0: [IntLiteral] 1
 #   42|                     1: [ParameterAccess] access to parameter index
 #   45|             2: [BlockStmt] {...}
@@ -110,11 +110,11 @@ indexers.cs:
 #   46|                 0: [AssignAndExpr] ... &= ...
 #   46|                   0: [ArrayAccess] access to array element
 #   46|                     -1: [FieldAccess] access to field bits
-#   46|                     0: [RShiftExpr] ... >> ...
+#   46|                     0: [RightShiftExpr] ... >> ...
 #   46|                       0: [ParameterAccess] access to parameter index
 #   46|                       1: [IntLiteral] 5
 #   46|                   1: [ComplementExpr] ~...
-#   46|                     0: [LShiftExpr] ... << ...
+#   46|                     0: [LeftShiftExpr] ... << ...
 #   46|                       0: [IntLiteral] 1
 #   46|                       1: [ParameterAccess] access to parameter index
 #   53|   2: [Class] CountPrimes
diff --git a/java/ql/lib/semmle/code/java/Expr.qll b/java/ql/lib/semmle/code/java/Expr.qll
index a10da9ecc9f..78eda1dba8d 100644
--- a/java/ql/lib/semmle/code/java/Expr.qll
+++ b/java/ql/lib/semmle/code/java/Expr.qll
@@ -366,11 +366,11 @@ class CompileTimeConstantExpr extends Expr {
         or
         b instanceof SubExpr and result = v1 - v2
         or
-        b instanceof LShiftExpr and result = v1.bitShiftLeft(v2)
+        b instanceof LeftShiftExpr and result = v1.bitShiftLeft(v2)
         or
-        b instanceof RShiftExpr and result = v1.bitShiftRightSigned(v2)
+        b instanceof RightShiftExpr and result = v1.bitShiftRightSigned(v2)
         or
-        b instanceof URShiftExpr and result = v1.bitShiftRight(v2)
+        b instanceof UnsignedRightShiftExpr and result = v1.bitShiftRight(v2)
         or
         b instanceof AndBitwiseExpr and result = v1.bitAnd(v2)
         or
@@ -623,26 +623,35 @@ class AssignXorExpr extends AssignOp, @assignxorexpr {
 }
 
 /** A compound assignment expression using the `<<=` operator. */
-class AssignLShiftExpr extends AssignOp, @assignlshiftexpr {
+class AssignLeftShiftExpr extends AssignOp, @assignlshiftexpr {
   override string getOp() { result = "<<=" }
 
-  override string getAPrimaryQlClass() { result = "AssignLShiftExpr" }
+  override string getAPrimaryQlClass() { result = "AssignLeftShiftExpr" }
 }
 
+/** DEPRECATED: Alias for AssignLeftShiftExpr. */
+deprecated class AssignLShiftExpr = AssignLeftShiftExpr;
+
 /** A compound assignment expression using the `>>=` operator. */
-class AssignRShiftExpr extends AssignOp, @assignrshiftexpr {
+class AssignRightShiftExpr extends AssignOp, @assignrshiftexpr {
   override string getOp() { result = ">>=" }
 
-  override string getAPrimaryQlClass() { result = "AssignRShiftExpr" }
+  override string getAPrimaryQlClass() { result = "AssignRightShiftExpr" }
 }
 
+/** DEPRECATED: Alias for AssignRightShiftExpr. */
+deprecated class AssignRShiftExpr = AssignRightShiftExpr;
+
 /** A compound assignment expression using the `>>>=` operator. */
-class AssignURShiftExpr extends AssignOp, @assignurshiftexpr {
+class AssignUnsignedRightShiftExpr extends AssignOp, @assignurshiftexpr {
   override string getOp() { result = ">>>=" }
 
-  override string getAPrimaryQlClass() { result = "AssignURShiftExpr" }
+  override string getAPrimaryQlClass() { result = "AssignUnsignedRightShiftExpr" }
 }
 
+/** DEPRECATED: Alias for AssignUnsignedRightShiftExpr. */
+deprecated class AssignURShiftExpr = AssignUnsignedRightShiftExpr;
+
 /** A common super-class to represent constant literals. */
 class Literal extends Expr, @literal {
   /**
@@ -904,26 +913,35 @@ class SubExpr extends BinaryExpr, @subexpr {
 }
 
 /** A binary expression using the `<<` operator. */
-class LShiftExpr extends BinaryExpr, @lshiftexpr {
+class LeftShiftExpr extends BinaryExpr, @lshiftexpr {
   override string getOp() { result = " << " }
 
-  override string getAPrimaryQlClass() { result = "LShiftExpr" }
+  override string getAPrimaryQlClass() { result = "LeftShiftExpr" }
 }
 
+/** DEPRECATED: Alias for LeftShiftExpr. */
+deprecated class LShiftExpr = LeftShiftExpr;
+
 /** A binary expression using the `>>` operator. */
-class RShiftExpr extends BinaryExpr, @rshiftexpr {
+class RightShiftExpr extends BinaryExpr, @rshiftexpr {
   override string getOp() { result = " >> " }
 
-  override string getAPrimaryQlClass() { result = "RShiftExpr" }
+  override string getAPrimaryQlClass() { result = "RightShiftExpr" }
 }
 
+/** DEPRECATED: Alias for RightShiftExpr. */
+deprecated class RShiftExpr = RightShiftExpr;
+
 /** A binary expression using the `>>>` operator. */
-class URShiftExpr extends BinaryExpr, @urshiftexpr {
+class UnsignedRightShiftExpr extends BinaryExpr, @urshiftexpr {
   override string getOp() { result = " >>> " }
 
-  override string getAPrimaryQlClass() { result = "URShiftExpr" }
+  override string getAPrimaryQlClass() { result = "UnsignedRightShiftExpr" }
 }
 
+/** DEPRECATED: Alias for UnsignedRightShiftExpr. */
+deprecated class URShiftExpr = UnsignedRightShiftExpr;
+
 /** A binary expression using the `&` operator. */
 class AndBitwiseExpr extends BinaryExpr, @andbitexpr {
   override string getOp() { result = " & " }
diff --git a/java/ql/lib/semmle/code/java/dataflow/ModulusAnalysis.qll b/java/ql/lib/semmle/code/java/dataflow/ModulusAnalysis.qll
index b919d143a39..5b2a39ad6c9 100644
--- a/java/ql/lib/semmle/code/java/dataflow/ModulusAnalysis.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/ModulusAnalysis.qll
@@ -105,7 +105,7 @@ private predicate evenlyDivisibleExpr(Expr e, int factor) {
   exists(ConstantIntegerExpr c, int k | k = c.getIntValue() |
     e.(MulExpr).getAnOperand() = c and factor = k.abs() and factor >= 2
     or
-    e.(LShiftExpr).getRhs() = c and factor = 2.pow(k) and k > 0
+    e.(LeftShiftExpr).getRhs() = c and factor = 2.pow(k) and k > 0
     or
     e.(BitwiseAndExpr).getAnOperand() = c and factor = max(int f | andmaskFactor(k, f))
   )
diff --git a/java/ql/lib/semmle/code/java/dataflow/RangeAnalysis.qll b/java/ql/lib/semmle/code/java/dataflow/RangeAnalysis.qll
index 835c4a20ac3..aeb79ee99e1 100644
--- a/java/ql/lib/semmle/code/java/dataflow/RangeAnalysis.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/RangeAnalysis.qll
@@ -528,11 +528,11 @@ private predicate boundFlowStepMul(Expr e2, Expr e1, int factor) {
     or
     exists(AssignMulExpr e | e = e2 and e.getDest() = c and e.getRhs() = e1 and factor = k)
     or
-    exists(LShiftExpr e |
+    exists(LeftShiftExpr e |
       e = e2 and e.getLeftOperand() = e1 and e.getRightOperand() = c and factor = 2.pow(k)
     )
     or
-    exists(AssignLShiftExpr e |
+    exists(AssignLeftShiftExpr e |
       e = e2 and e.getDest() = e1 and e.getRhs() = c and factor = 2.pow(k)
     )
   )
@@ -552,19 +552,19 @@ private predicate boundFlowStepDiv(Expr e2, Expr e1, int factor) {
     or
     exists(AssignDivExpr e | e = e2 and e.getDest() = e1 and e.getRhs() = c and factor = k)
     or
-    exists(RShiftExpr e |
+    exists(RightShiftExpr e |
       e = e2 and e.getLeftOperand() = e1 and e.getRightOperand() = c and factor = 2.pow(k)
     )
     or
-    exists(AssignRShiftExpr e |
+    exists(AssignRightShiftExpr e |
       e = e2 and e.getDest() = e1 and e.getRhs() = c and factor = 2.pow(k)
     )
     or
-    exists(URShiftExpr e |
+    exists(UnsignedRightShiftExpr e |
       e = e2 and e.getLeftOperand() = e1 and e.getRightOperand() = c and factor = 2.pow(k)
     )
     or
-    exists(AssignURShiftExpr e |
+    exists(AssignUnsignedRightShiftExpr e |
       e = e2 and e.getDest() = e1 and e.getRhs() = c and factor = 2.pow(k)
     )
   )
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/ModulusAnalysisSpecific.qll b/java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/ModulusAnalysisSpecific.qll
index c5d5bc98009..7e13861c0da 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/ModulusAnalysisSpecific.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/ModulusAnalysisSpecific.qll
@@ -72,13 +72,13 @@ module Private {
   }
 
   /** A left shift or an assign-lshift expression. */
-  class LShiftExpr extends J::Expr {
-    LShiftExpr() { this instanceof J::LShiftExpr or this instanceof J::AssignLShiftExpr }
+  class LeftShiftExpr extends J::Expr {
+    LeftShiftExpr() { this instanceof J::LeftShiftExpr or this instanceof J::AssignLeftShiftExpr }
 
     /** Gets the RHS operand of this shift. */
     Expr getRhs() {
-      result = this.(J::LShiftExpr).getRightOperand() or
-      result = this.(J::AssignLShiftExpr).getRhs()
+      result = this.(J::LeftShiftExpr).getRightOperand() or
+      result = this.(J::AssignLeftShiftExpr).getRhs()
     }
   }
 
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/Sign.qll b/java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/Sign.qll
index b2058a27114..649b4216996 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/Sign.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/Sign.qll
@@ -18,9 +18,9 @@ newtype TBinarySignOperation =
   TBitAndOp() or
   TBitOrOp() or
   TBitXorOp() or
-  TLShiftOp() or
-  TRShiftOp() or
-  TURShiftOp()
+  TLeftShiftOp() or
+  TRightShiftOp() or
+  TUnsignedRightShiftOp()
 
 /** Class representing expression signs (+, -, 0). */
 class Sign extends TSign {
@@ -271,10 +271,10 @@ class Sign extends TSign {
     or
     op = TBitXorOp() and result = bitxor(s)
     or
-    op = TLShiftOp() and result = lshift(s)
+    op = TLeftShiftOp() and result = lshift(s)
     or
-    op = TRShiftOp() and result = rshift(s)
+    op = TRightShiftOp() and result = rshift(s)
     or
-    op = TURShiftOp() and result = urshift(s)
+    op = TUnsignedRightShiftOp() and result = urshift(s)
   }
 }
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SignAnalysisSpecific.qll b/java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SignAnalysisSpecific.qll
index b2b63ff3633..59f7f4580a8 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SignAnalysisSpecific.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SignAnalysisSpecific.qll
@@ -102,12 +102,12 @@ module Private {
       this instanceof J::AssignOrExpr or
       this instanceof J::XorBitwiseExpr or
       this instanceof J::AssignXorExpr or
-      this instanceof J::LShiftExpr or
-      this instanceof J::AssignLShiftExpr or
-      this instanceof J::RShiftExpr or
-      this instanceof J::AssignRShiftExpr or
-      this instanceof J::URShiftExpr or
-      this instanceof J::AssignURShiftExpr
+      this instanceof J::LeftShiftExpr or
+      this instanceof J::AssignLeftShiftExpr or
+      this instanceof J::RightShiftExpr or
+      this instanceof J::AssignRightShiftExpr or
+      this instanceof J::UnsignedRightShiftExpr or
+      this instanceof J::AssignUnsignedRightShiftExpr
     }
 
     /** Returns the operation representing this expression. */
@@ -144,17 +144,17 @@ module Private {
       or
       this instanceof J::AssignXorExpr and result = TBitXorOp()
       or
-      this instanceof J::LShiftExpr and result = TLShiftOp()
+      this instanceof J::LeftShiftExpr and result = TLeftShiftOp()
       or
-      this instanceof J::AssignLShiftExpr and result = TLShiftOp()
+      this instanceof J::AssignLeftShiftExpr and result = TLeftShiftOp()
       or
-      this instanceof J::RShiftExpr and result = TRShiftOp()
+      this instanceof J::RightShiftExpr and result = TRightShiftOp()
       or
-      this instanceof J::AssignRShiftExpr and result = TRShiftOp()
+      this instanceof J::AssignRightShiftExpr and result = TRightShiftOp()
       or
-      this instanceof J::URShiftExpr and result = TURShiftOp()
+      this instanceof J::UnsignedRightShiftExpr and result = TUnsignedRightShiftOp()
       or
-      this instanceof J::AssignURShiftExpr and result = TURShiftOp()
+      this instanceof J::AssignUnsignedRightShiftExpr and result = TUnsignedRightShiftOp()
     }
 
     Expr getLeftOperand() {
diff --git a/java/ql/src/Likely Bugs/Arithmetic/LShiftLargerThanTypeWidth.ql b/java/ql/src/Likely Bugs/Arithmetic/LShiftLargerThanTypeWidth.ql
index 92bec98fd5e..f3c0b220080 100644
--- a/java/ql/src/Likely Bugs/Arithmetic/LShiftLargerThanTypeWidth.ql	
+++ b/java/ql/src/Likely Bugs/Arithmetic/LShiftLargerThanTypeWidth.ql	
@@ -14,7 +14,7 @@ int integralTypeWidth(IntegralType t) {
   if t.hasName("long") or t.hasName("Long") then result = 64 else result = 32
 }
 
-from LShiftExpr shift, IntegralType t, int v, string typname, int width
+from LeftShiftExpr shift, IntegralType t, int v, string typname, int width
 where
   shift.getLeftOperand().getType() = t and
   shift.getRightOperand().(CompileTimeConstantExpr).getIntValue() = v and
diff --git a/java/ql/src/Likely Bugs/Arithmetic/WhitespaceContradictsPrecedence.ql b/java/ql/src/Likely Bugs/Arithmetic/WhitespaceContradictsPrecedence.ql
index db806ef760c..b0508b8eb38 100644
--- a/java/ql/src/Likely Bugs/Arithmetic/WhitespaceContradictsPrecedence.ql	
+++ b/java/ql/src/Likely Bugs/Arithmetic/WhitespaceContradictsPrecedence.ql	
@@ -33,9 +33,9 @@ class ArithmeticExpr extends BinaryExpr {
  */
 class ShiftExpr extends BinaryExpr {
   ShiftExpr() {
-    this instanceof LShiftExpr or
-    this instanceof RShiftExpr or
-    this instanceof URShiftExpr
+    this instanceof LeftShiftExpr or
+    this instanceof RightShiftExpr or
+    this instanceof UnsignedRightShiftExpr
   }
 }
 
diff --git a/java/ql/src/Likely Bugs/Comparison/UselessComparisonTest.ql b/java/ql/src/Likely Bugs/Comparison/UselessComparisonTest.ql
index 964a5a6060a..b4076bee00b 100644
--- a/java/ql/src/Likely Bugs/Comparison/UselessComparisonTest.ql	
+++ b/java/ql/src/Likely Bugs/Comparison/UselessComparisonTest.ql	
@@ -99,7 +99,7 @@ Expr overFlowCand() {
   |
     bin instanceof AddExpr or
     bin instanceof MulExpr or
-    bin instanceof LShiftExpr
+    bin instanceof LeftShiftExpr
   )
   or
   exists(AssignOp op |
@@ -109,7 +109,7 @@ Expr overFlowCand() {
   |
     op instanceof AssignAddExpr or
     op instanceof AssignMulExpr or
-    op instanceof AssignLShiftExpr
+    op instanceof AssignLeftShiftExpr
   )
   or
   exists(AddExpr add, CompileTimeConstantExpr c |
diff --git a/java/ql/src/Security/CWE/CWE-190/ArithmeticCommon.qll b/java/ql/src/Security/CWE/CWE-190/ArithmeticCommon.qll
index 8287ebc869e..122f6b75b4a 100644
--- a/java/ql/src/Security/CWE/CWE-190/ArithmeticCommon.qll
+++ b/java/ql/src/Security/CWE/CWE-190/ArithmeticCommon.qll
@@ -153,9 +153,9 @@ predicate upcastToWiderType(Expr e) {
 /** Holds if the result of `exp` has certain bits filtered by a bitwise and. */
 private predicate inBitwiseAnd(Expr exp) {
   exists(AndBitwiseExpr a | a.getAnOperand() = exp) or
-  inBitwiseAnd(exp.(LShiftExpr).getAnOperand()) or
-  inBitwiseAnd(exp.(RShiftExpr).getAnOperand()) or
-  inBitwiseAnd(exp.(URShiftExpr).getAnOperand())
+  inBitwiseAnd(exp.(LeftShiftExpr).getAnOperand()) or
+  inBitwiseAnd(exp.(RightShiftExpr).getAnOperand()) or
+  inBitwiseAnd(exp.(UnsignedRightShiftExpr).getAnOperand())
 }
 
 /** Holds if overflow/underflow is irrelevant for this expression. */
diff --git a/java/ql/src/Security/CWE/CWE-681/NumericCastCommon.qll b/java/ql/src/Security/CWE/CWE-681/NumericCastCommon.qll
index 4dec14a204f..5a77c0a8d6e 100644
--- a/java/ql/src/Security/CWE/CWE-681/NumericCastCommon.qll
+++ b/java/ql/src/Security/CWE/CWE-681/NumericCastCommon.qll
@@ -16,10 +16,10 @@ class NumericNarrowingCastExpr extends CastExpr {
 
 class RightShiftOp extends Expr {
   RightShiftOp() {
-    this instanceof RShiftExpr or
-    this instanceof URShiftExpr or
-    this instanceof AssignRShiftExpr or
-    this instanceof AssignURShiftExpr
+    this instanceof RightShiftExpr or
+    this instanceof UnsignedRightShiftExpr or
+    this instanceof AssignRightShiftExpr or
+    this instanceof AssignUnsignedRightShiftExpr
   }
 
   private Expr getLhs() {
diff --git a/java/ql/test/kotlin/library-tests/exprs/PrintAst.expected b/java/ql/test/kotlin/library-tests/exprs/PrintAst.expected
index 78bf583ec0d..3b4cc35d4d4 100644
--- a/java/ql/test/kotlin/library-tests/exprs/PrintAst.expected
+++ b/java/ql/test/kotlin/library-tests/exprs/PrintAst.expected
@@ -1944,17 +1944,17 @@ exprs.kt:
 #   15|               1: [VarAccess] y
 #   16|         5: [LocalVariableDeclStmt] var ...;
 #   16|           1: [LocalVariableDeclExpr] i6
-#   16|             0: [LShiftExpr] ... << ...
+#   16|             0: [LeftShiftExpr] ... << ...
 #   16|               0: [VarAccess] x
 #   16|               1: [VarAccess] y
 #   17|         6: [LocalVariableDeclStmt] var ...;
 #   17|           1: [LocalVariableDeclExpr] i7
-#   17|             0: [RShiftExpr] ... >> ...
+#   17|             0: [RightShiftExpr] ... >> ...
 #   17|               0: [VarAccess] x
 #   17|               1: [VarAccess] y
 #   18|         7: [LocalVariableDeclStmt] var ...;
 #   18|           1: [LocalVariableDeclExpr] i8
-#   18|             0: [URShiftExpr] ... >>> ...
+#   18|             0: [UnsignedRightShiftExpr] ... >>> ...
 #   18|               0: [VarAccess] x
 #   18|               1: [VarAccess] y
 #   19|         8: [LocalVariableDeclStmt] var ...;
@@ -2236,17 +2236,17 @@ exprs.kt:
 #   72|               1: [VarAccess] ly
 #   73|         59: [LocalVariableDeclStmt] var ...;
 #   73|           1: [LocalVariableDeclExpr] l6
-#   73|             0: [LShiftExpr] ... << ...
+#   73|             0: [LeftShiftExpr] ... << ...
 #   73|               0: [VarAccess] lx
 #   73|               1: [VarAccess] y
 #   74|         60: [LocalVariableDeclStmt] var ...;
 #   74|           1: [LocalVariableDeclExpr] l7
-#   74|             0: [RShiftExpr] ... >> ...
+#   74|             0: [RightShiftExpr] ... >> ...
 #   74|               0: [VarAccess] lx
 #   74|               1: [VarAccess] y
 #   75|         61: [LocalVariableDeclStmt] var ...;
 #   75|           1: [LocalVariableDeclExpr] l8
-#   75|             0: [URShiftExpr] ... >>> ...
+#   75|             0: [UnsignedRightShiftExpr] ... >>> ...
 #   75|               0: [VarAccess] lx
 #   75|               1: [VarAccess] y
 #   76|         62: [LocalVariableDeclStmt] var ...;
diff --git a/java/ql/test/kotlin/library-tests/exprs/exprs.expected b/java/ql/test/kotlin/library-tests/exprs/exprs.expected
index 5d35293eb22..07d57c444e4 100644
--- a/java/ql/test/kotlin/library-tests/exprs/exprs.expected
+++ b/java/ql/test/kotlin/library-tests/exprs/exprs.expected
@@ -924,15 +924,15 @@
 | exprs.kt:15:18:15:18 | y | exprs.kt:4:1:142:1 | topLevelMethod | VarAccess |
 | exprs.kt:16:9:16:10 | i6 | exprs.kt:4:1:142:1 | topLevelMethod | LocalVariableDeclExpr |
 | exprs.kt:16:14:16:14 | x | exprs.kt:4:1:142:1 | topLevelMethod | VarAccess |
-| exprs.kt:16:14:16:20 | ... << ... | exprs.kt:4:1:142:1 | topLevelMethod | LShiftExpr |
+| exprs.kt:16:14:16:20 | ... << ... | exprs.kt:4:1:142:1 | topLevelMethod | LeftShiftExpr |
 | exprs.kt:16:20:16:20 | y | exprs.kt:4:1:142:1 | topLevelMethod | VarAccess |
 | exprs.kt:17:9:17:10 | i7 | exprs.kt:4:1:142:1 | topLevelMethod | LocalVariableDeclExpr |
 | exprs.kt:17:14:17:14 | x | exprs.kt:4:1:142:1 | topLevelMethod | VarAccess |
-| exprs.kt:17:14:17:20 | ... >> ... | exprs.kt:4:1:142:1 | topLevelMethod | RShiftExpr |
+| exprs.kt:17:14:17:20 | ... >> ... | exprs.kt:4:1:142:1 | topLevelMethod | RightShiftExpr |
 | exprs.kt:17:20:17:20 | y | exprs.kt:4:1:142:1 | topLevelMethod | VarAccess |
 | exprs.kt:18:9:18:10 | i8 | exprs.kt:4:1:142:1 | topLevelMethod | LocalVariableDeclExpr |
 | exprs.kt:18:14:18:14 | x | exprs.kt:4:1:142:1 | topLevelMethod | VarAccess |
-| exprs.kt:18:14:18:21 | ... >>> ... | exprs.kt:4:1:142:1 | topLevelMethod | URShiftExpr |
+| exprs.kt:18:14:18:21 | ... >>> ... | exprs.kt:4:1:142:1 | topLevelMethod | UnsignedRightShiftExpr |
 | exprs.kt:18:21:18:21 | y | exprs.kt:4:1:142:1 | topLevelMethod | VarAccess |
 | exprs.kt:19:9:19:10 | i9 | exprs.kt:4:1:142:1 | topLevelMethod | LocalVariableDeclExpr |
 | exprs.kt:19:14:19:14 | x | exprs.kt:4:1:142:1 | topLevelMethod | VarAccess |
@@ -1162,15 +1162,15 @@
 | exprs.kt:72:19:72:20 | ly | exprs.kt:4:1:142:1 | topLevelMethod | VarAccess |
 | exprs.kt:73:9:73:10 | l6 | exprs.kt:4:1:142:1 | topLevelMethod | LocalVariableDeclExpr |
 | exprs.kt:73:14:73:15 | lx | exprs.kt:4:1:142:1 | topLevelMethod | VarAccess |
-| exprs.kt:73:14:73:21 | ... << ... | exprs.kt:4:1:142:1 | topLevelMethod | LShiftExpr |
+| exprs.kt:73:14:73:21 | ... << ... | exprs.kt:4:1:142:1 | topLevelMethod | LeftShiftExpr |
 | exprs.kt:73:21:73:21 | y | exprs.kt:4:1:142:1 | topLevelMethod | VarAccess |
 | exprs.kt:74:9:74:10 | l7 | exprs.kt:4:1:142:1 | topLevelMethod | LocalVariableDeclExpr |
 | exprs.kt:74:14:74:15 | lx | exprs.kt:4:1:142:1 | topLevelMethod | VarAccess |
-| exprs.kt:74:14:74:21 | ... >> ... | exprs.kt:4:1:142:1 | topLevelMethod | RShiftExpr |
+| exprs.kt:74:14:74:21 | ... >> ... | exprs.kt:4:1:142:1 | topLevelMethod | RightShiftExpr |
 | exprs.kt:74:21:74:21 | y | exprs.kt:4:1:142:1 | topLevelMethod | VarAccess |
 | exprs.kt:75:9:75:10 | l8 | exprs.kt:4:1:142:1 | topLevelMethod | LocalVariableDeclExpr |
 | exprs.kt:75:14:75:15 | lx | exprs.kt:4:1:142:1 | topLevelMethod | VarAccess |
-| exprs.kt:75:14:75:22 | ... >>> ... | exprs.kt:4:1:142:1 | topLevelMethod | URShiftExpr |
+| exprs.kt:75:14:75:22 | ... >>> ... | exprs.kt:4:1:142:1 | topLevelMethod | UnsignedRightShiftExpr |
 | exprs.kt:75:22:75:22 | y | exprs.kt:4:1:142:1 | topLevelMethod | VarAccess |
 | exprs.kt:76:9:76:10 | l9 | exprs.kt:4:1:142:1 | topLevelMethod | LocalVariableDeclExpr |
 | exprs.kt:76:14:76:15 | lx | exprs.kt:4:1:142:1 | topLevelMethod | VarAccess |
diff --git a/java/ql/test/library-tests/constants/PrintAst.expected b/java/ql/test/library-tests/constants/PrintAst.expected
index 241d837ea3c..63d59f7287e 100644
--- a/java/ql/test/library-tests/constants/PrintAst.expected
+++ b/java/ql/test/library-tests/constants/PrintAst.expected
@@ -376,26 +376,26 @@ constants/Values.java:
 #   62|         43: [LocalVariableDeclStmt] var ...;
 #   62|           0: [TypeAccess] int
 #   62|           1: [LocalVariableDeclExpr] lshift
-#   62|             0: [LShiftExpr] ... << ...
+#   62|             0: [LeftShiftExpr] ... << ...
 #   62|               0: [IntegerLiteral] 21
 #   62|               1: [IntegerLiteral] 2
 #   63|         44: [LocalVariableDeclStmt] var ...;
 #   63|           0: [TypeAccess] int
 #   63|           1: [LocalVariableDeclExpr] lshift_parameter
-#   63|             0: [LShiftExpr] ... << ...
+#   63|             0: [LeftShiftExpr] ... << ...
 #   63|               0: [VarAccess] notConstant
 #   63|               1: [VarAccess] notConstant
 #   65|         45: [LocalVariableDeclStmt] var ...;
 #   65|           0: [TypeAccess] int
 #   65|           1: [LocalVariableDeclExpr] rshift
-#   65|             0: [RShiftExpr] ... >> ...
+#   65|             0: [RightShiftExpr] ... >> ...
 #   65|               0: [MinusExpr] -...
 #   65|                 0: [IntegerLiteral] 1
 #   65|               1: [IntegerLiteral] 2
 #   66|         46: [LocalVariableDeclStmt] var ...;
 #   66|           0: [TypeAccess] int
 #   66|           1: [LocalVariableDeclExpr] urshift
-#   66|             0: [URShiftExpr] ... >>> ...
+#   66|             0: [UnsignedRightShiftExpr] ... >>> ...
 #   66|               0: [MinusExpr] -...
 #   66|                 0: [IntegerLiteral] 1
 #   66|               1: [IntegerLiteral] 1